浏览代码

分账时间调整

zhijiezhao 3 年之前
父节点
当前提交
fe88e9999b

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

@@ -1038,6 +1038,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         log.info("【延时分账】>>>>>>>>>>延时分账,每一小时执行一次");
         log.info("【延时分账】>>>>>>>>>>延时分账,每一小时执行一次");
         Calendar calendar = Calendar.getInstance();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         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");
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currentTime = format.format(calendar.getTime());
         String currentTime = format.format(calendar.getTime());

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

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

+ 3 - 3
src/main/resources/mapper/PayOrderMapper.xml

@@ -46,13 +46,13 @@
         VALUES (#{orderId}, #{vipRecordId}, #{authVipRecordId}, #{vipMonth}, #{linkLogo}, #{unpaidAmount},
         VALUES (#{orderId}, #{vipRecordId}, #{authVipRecordId}, #{vipMonth}, #{linkLogo}, #{unpaidAmount},
                 #{generateTime}, #{effectiveTime}, #{payStatus}, #{payType}, #{delFlag})
                 #{generateTime}, #{effectiveTime}, #{payStatus}, #{payType}, #{delFlag})
     </insert>
     </insert>
-    <insert id="insertSplitAccount" keyColumn="id" keyProperty="id"  parameterType="com.caimei365.order.model.po.SplitAccountPo">
+    <insert id="insertSplitAccount" keyColumn="id" keyProperty="id"  parameterType="com.caimei365.order.model.po.SplitAccountPo" useGeneratedKeys="true">
         INSERT INTO cm_split_account (orderId, productId, orderProductId, shopId, couponRecordId,vipRecordId, authVipRecordId, type, subUserNo, splitAccount,
         INSERT INTO cm_split_account (orderId, productId, orderProductId, shopId, couponRecordId,vipRecordId, authVipRecordId, type, subUserNo, splitAccount,
                                         mbOrderId, orderRequestNo,payStatus, productType, splitTime)
                                         mbOrderId, orderRequestNo,payStatus, productType, splitTime)
         VALUES (#{orderId}, #{productId}, #{orderProductId}, #{shopId},#{couponRecordId},#{vipRecordId}, #{authVipRecordId}, #{type}, #{subUserNo}, #{splitAccount},
         VALUES (#{orderId}, #{productId}, #{orderProductId}, #{shopId},#{couponRecordId},#{vipRecordId}, #{authVipRecordId}, #{type}, #{subUserNo}, #{splitAccount},
                 #{mbOrderId}, #{orderRequestNo}, #{payStatus}, #{productType}, NOW());
                 #{mbOrderId}, #{orderRequestNo}, #{payStatus}, #{productType}, NOW());
     </insert>
     </insert>
-    <insert id="insertPayShop" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.PayShopPo">
+    <insert id="insertPayShop" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.PayShopPo" useGeneratedKeys="true">
         INSERT INTO cm_pay_shop (shopID, name, bankAccountName, bankAccount, bankName, type, totalAmount, balancePayFee,
         INSERT INTO cm_pay_shop (shopID, name, bankAccountName, bankAccount, bankName, type, totalAmount, balancePayFee,
                                  transferPayFee, payType, wipePayment, wipeRemarks, wipeRemarkImages, wipeTime, applicant,
                                  transferPayFee, payType, wipePayment, wipeRemarks, wipeRemarkImages, wipeTime, applicant,
                                  applyTime, reviewer, reviewTime, payTime, status, reason, delFlag)
                                  applyTime, reviewer, reviewTime, payTime, status, reason, delFlag)
@@ -60,7 +60,7 @@
                 #{transferPayFee}, #{payType}, #{wipePayment}, #{wipeRemarks}, #{wipeRemarkImages}, #{wipeTime}, #{applicant},
                 #{transferPayFee}, #{payType}, #{wipePayment}, #{wipeRemarks}, #{wipeRemarkImages}, #{wipeTime}, #{applicant},
                 #{applyTime}, #{reviewer}, #{reviewTime}, #{payTime}, #{status}, #{reason}, #{delFlag})
                 #{applyTime}, #{reviewer}, #{reviewTime}, #{payTime}, #{status}, #{reason}, #{delFlag})
     </insert>
     </insert>
-    <insert id="insertPayShopRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.PayShopRecordPo">
+    <insert id="insertPayShopRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.po.PayShopRecordPo" useGeneratedKeys="true">
         INSERT INTO cm_pay_shop_record (shopID, shopOrderID, shopOrderNo, payAmount, wipePayment, payType, payTime, payShopID, status, delFlag)
         INSERT INTO cm_pay_shop_record (shopID, shopOrderID, shopOrderNo, payAmount, wipePayment, payType, payTime, payShopID, status, delFlag)
         VALUES (#{shopId}, #{shopOrderId}, #{shopOrderNo}, #{payAmount}, #{wipePayment}, #{payType}, #{payTime}, #{payShopId}, #{status}, #{delFlag})
         VALUES (#{shopId}, #{shopOrderId}, #{shopOrderNo}, #{payAmount}, #{wipePayment}, #{payType}, #{payTime}, #{payShopId}, #{status}, #{delFlag})
     </insert>
     </insert>