需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -231,15 +231,16 @@ public class PayOrderLogic {
         if (workerOrderBuy.getServicePrice() != null){
 
             totalAmount = totalAmount.add(workerOrderBuy.getServicePrice());
+            workerAmount = workerAmount.add(workerOrderBuy.getServicePrice());
 
             BigDecimal workerServiceProceAmount = workerOrderBuy.getServicePrice().multiply(Convert.toBigDecimal("0.006"));
 
 
             if (workerServiceProceAmount.doubleValue() > 0.01) {
-                workerProceAmount.add(workerServiceProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
+                workerProceAmount =workerProceAmount.add(workerServiceProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
             }else {
-                workerProceAmount.add(Convert.toBigDecimal("0.01"));
+                workerProceAmount =workerProceAmount.add(Convert.toBigDecimal("0.01"));
             }
         }
 
@@ -247,14 +248,15 @@ public class PayOrderLogic {
         if (workerOrderBuy.getOtherPrice() != null){
 
             totalAmount = totalAmount.add(workerOrderBuy.getOtherPrice());
+            workerAmount = workerAmount.add(workerOrderBuy.getServicePrice());
             BigDecimal workerOtherProceAmount = workerOrderBuy.getOtherPrice().multiply(Convert.toBigDecimal("0.006"));
 
 
             if (workerOtherProceAmount.doubleValue() > 0.01) {
-                workerProceAmount.add(workerOtherProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
+                workerProceAmount =workerProceAmount.add(workerOtherProceAmount.setScale(2, BigDecimal.ROUND_CEILING));
 
             }else {
-                workerProceAmount.add(Convert.toBigDecimal("0.01"));
+                workerProceAmount =workerProceAmount.add(Convert.toBigDecimal("0.01"));
             }
 
         }

mall-server-api/src/main/java/com/gree/mall/manager/controller/policy/MailboxController.java

@@ -3,11 +3,13 @@ package com.gree.mall.manager.controller.policy;
 import cn.hutool.core.lang.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.gree.mall.manager.annotation.ZfireList;
 import com.gree.mall.manager.bean.policy.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.policy.AgreementLogic;
+import com.gree.mall.manager.logic.websit.SettlementOrderLogic;
 import com.gree.mall.manager.plus.entity.Mailbox;
 import com.gree.mall.manager.plus.entity.MailboxSendRecord;
 import com.gree.mall.manager.plus.entity.MailboxSendRecordPolicy;
@@ -35,6 +37,9 @@ public class MailboxController {
     @Autowired
     private AgreementLogic agreementLogic;
 
+    @Autowired
+    SettlementOrderLogic settlementOrderLogic;
+
 
     @PostMapping("/detail")
     @ApiOperation("邮箱配置详情")
@@ -166,4 +171,11 @@ public class MailboxController {
         return ResponseHelper.success();
     }
 
+    @ApiOperation(value = "测试过期提醒")
+    @PostMapping("task8")
+    public ResponseHelper task8() throws IOException, MessagingException, WxPayException {
+        settlementOrderLogic.sync();
+        return ResponseHelper.success();
+    }
+
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -332,7 +332,7 @@
             and a.is_exception =1 and a.order_status NOT IN ('YWG','YWGO','YJS')
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='DYY'.toString()">
-            and a.appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD')
+            and a.appointment_time is null
         </if>
         <if test="ex.partsApplyStatus != null and ex.partsApplyStatus =='PJSQZ'.toString()">
             and a.id in(select order_base_id from websit_parts_apply where `status` = 'ING')