修改bug

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

@@ -209,8 +209,8 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             paramsMap.put("endUpdateTime", sdf.format(endCreateTime));
         } else {
             // 待发货订单
-            paramsMap.put("startCreateTime", startCreateTime);
-            paramsMap.put("endCreateTime", sdf.format(endCreateTime));
+            paramsMap.put("startUpdateTime", startCreateTime);
+            paramsMap.put("endUpdateTime", sdf.format(endCreateTime));
             logger.info("时间信息：{}, {}", startCreateTime, endCreateTime);
         }
         if(sta != null && !"".equals(sta)){
@@ -336,28 +336,20 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
     @Override
     @Transactional
     public synchronized Integer syncXYTOrderByJD(Integer type) {
+        Date now = new Date();
         Calendar calendar = Calendar.getInstance();
+        calendar.setTime(now);
         if(type == 1){
             SysConfig sysConfig = sysConfigMapper.getSysConfigAllLock(PULL_JD_ID);
-            Date date = new Date();
-            try {
-                date = SYS_CONFIG_SDF.parse(sysConfig.getConfigRemarks());
-                Calendar newDate = Calendar.getInstance();
-                calendar.setTime(date);
-                if(calendar.get(Calendar.DATE) == newDate.get(Calendar.DATE)){
-                    logger.info("该定时任务已经运行！");
-                    // return 0;
-                }
-                calendar.set(Calendar.HOUR_OF_DAY,0);
-                calendar.set(Calendar.MINUTE,0);
-                calendar.set(Calendar.SECOND,0);
-            } catch (ParseException e) {
-                e.printStackTrace();
-                logger.info("获取配置文件失败！");
-                return 0;
+            Calendar newDate = Calendar.getInstance();
+            if(calendar.get(Calendar.DATE) == newDate.get(Calendar.DATE)){
+                logger.info("该定时任务已经运行！");
+                // return 0;
             }
+            calendar.set(Calendar.HOUR_OF_DAY,0);
+            calendar.set(Calendar.MINUTE,0);
+            calendar.set(Calendar.SECOND,0);
         }else{
-            calendar.add(Calendar.DATE,-5);
             calendar.set(Calendar.HOUR_OF_DAY,0);
             calendar.set(Calendar.MINUTE,0);
             calendar.set(Calendar.SECOND,0);
@@ -379,6 +371,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
         conditionTypeList.add(beginCreateTimeMap);*/
 
         paramsMap.put("startCreateTime", sdf.format(calendar.getTime()));
+        paramsMap.put("endCreateTime", sdf.format(now));
         paramsMap.put("shopId", "100206182446");
         paramsMap.put("size", 20);