小亚通接口修复

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -2748,7 +2748,7 @@
         update tb_rst_sales_order_info
         <set >
             <if test="salesUserRemark != null ">
-                sales_user_remark = #{salesUserRemark}
+                sales_user_remark = #{salesUserRemark},
             </if >
             <if test="salesAdminRemark != null ">
                 sales_admin_remark = #{salesAdminRemark}

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

@@ -336,12 +336,11 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
             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.setTime(date);
                 calendar.set(Calendar.HOUR_OF_DAY,0);
                 calendar.set(Calendar.MINUTE,0);
                 calendar.set(Calendar.SECOND,0);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -652,7 +652,7 @@ public class MQTask implements InitializingBean {
 	/**
 	 * 同步拉取京东自发订单的发货单号
 	 */
-	@Scheduled(cron = "0 50 3 * * ?")//每天晚上3.50触发
+	@Scheduled(cron = "0 0 4 * * ?")//每天上午午4点触发
 	public void syncXytOrderByJd(){
 		logger.info("-----定时拉取拉取京东仓已发货订单-开始----");
 		Integer flag = orderSyncLogService.syncXYTOrderByJD(1);