Browse Source

分账时间调整

zhijiezhao 3 years ago
parent
commit
64a16f293c

+ 1 - 1
src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -1039,7 +1039,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         //测试停掉
-//        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currentTime = format.format(calendar.getTime());
         // 查询未分账已支付收款

+ 0 - 1
src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -384,7 +384,6 @@ public class SubmitServiceImpl implements SubmitService {
         // 订单商品列表
         List<OrderProductPo> orderProductList = new ArrayList<>();
         List<String> productIdList = new ArrayList<>();
-        Integer userIdentity = baseMapper.getIdentityByUserId(orderParamBo.getUserId());
 
         // 子订单订单列表
         List<OrderShopPo> shopOrderList = new ArrayList<>();

+ 1 - 1
src/main/java/com/caimei365/order/task/DelayedSplittingTask.java

@@ -27,7 +27,7 @@ public class DelayedSplittingTask {
      * 延时分账,每一小时执行一次
      * 测试0 0/2
      */
-    @Scheduled(cron = "0 0/2 * * * ?")
+    @Scheduled(cron = "0 0 * * * ?")
     public void delayedSplitting() {
         payOrderService.delayedSplitting(delayedSplittingUrl);
     }

+ 1 - 1
src/main/resources/mapper/OrderClubMapper.xml

@@ -513,7 +513,7 @@
         LEFT JOIN cm_coupon cc ON a.couponId = cc.id
         WHERE if(cc.moneyCouponFlag=2,cc.delFlag = 0,cc.id>0)
         AND a.delFlag = 0
-        AND a.id = #{clubCouponId}
+        AND a.couponId = #{clubCouponId}
         AND a.status = 1
         AND NOW() <![CDATA[ > ]]> startDate
         AND NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM user WHERE userID = #{userId}),startDate),