xian 3 سال پیش
والد
کامیت
72e41b5919

+ 2 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -196,7 +196,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         Map<String,Object> paramsMap = new HashMap<>(1);
         String startCreateTime = null;
         if(creatTime == null){
-            startCreateTime = sdf.format(orderSyncPlatform.getSyncOrderLastTime());
+            startCreateTime = sdf.format(DateTimeUtil.addHour(new Date(), -23));
         }else{
             startCreateTime =  sdf.format(creatTime);
         }
@@ -211,6 +211,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             // 待发货订单
             paramsMap.put("startCreateTime", startCreateTime);
             paramsMap.put("endCreateTime", sdf.format(endCreateTime));
+            logger.info("时间信息:{}, {}", startCreateTime, endCreateTime);
         }
         if(sta != null && !"".equals(sta)){
             paramsMap.put("orderStatus", sta);

+ 5 - 7
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderPlatformController.java

@@ -9,6 +9,7 @@ import com.iamberry.rst.faces.order.OrderSyncLogService;
 import com.iamberry.rst.faces.order.OrderSyncPlatformService;
 import com.iamberry.rst.util.GenerateKeyUtil;
 import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -21,10 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 同步订单
@@ -71,9 +69,9 @@ public class AdminOrderPlatformController {
     @ResponseBody
     @RequestMapping("/pull")
     public ResponseJson pullOrder(HttpServletRequest request){
-        Calendar calendar = Calendar.getInstance();
-        calendar.set(2019,2,4);
-        Integer num = orderSyncLogService.syncXYTOrder(2,"20",calendar.getTime());
+        Date date = new Date();
+        Date date1 = DateTimeUtil.addHour(date, -23);
+        Integer num = orderSyncLogService.syncXYTOrder(2,"20", date1);
         ResponseJson rj = new ResponseJson();
         rj.setResultMsg("已同步"+num+"个订单");
         return  rj;