需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -221,7 +221,7 @@ public class WorkerLogic {
 
         PolicyOrderDetail policyOrderDetail = BeanUtil.toBean(policyOrder, PolicyOrderDetail.class);
 
-        Policy policy = policyService.getById(workerPolicy.getOrderId());
+        Policy policy = policyService.getById(policyOrderDetail.getPolicyId());
 
 
         List<PolicyRange> policyRanges = policyRangeService.lambdaQuery().eq(PolicyRange::getPolicyId, policy.getId()).list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -750,20 +750,35 @@ public class AgreementLogic {
                 .set(PolicyOrder::getPolicyOrderStatus,PolicyOrderStatusEnum.YSX.getKey()).update();
 
 
-        workerPolicyService.lambdaUpdate()
-                .ge(WorkerPolicy::getEndTime,new Date())
-                .le(WorkerPolicy::getStartTime,new Date())
-                .ne(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
-                .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
-                .update();
+        List<PolicyOrder> list = policyOrderService.lambdaQuery()
+                .ge(PolicyOrder::getEndTime, new Date())
+                .le(PolicyOrder::getStartTime, new Date())
+                .eq(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
+                .ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
+                .select(PolicyOrder::getId)
+                .list();
+
+        if (!CollectionUtils.isEmpty(list)){
+            workerPolicyService.lambdaUpdate()
+                    .ge(WorkerPolicy::getEndTime,new Date())
+                    .le(WorkerPolicy::getStartTime,new Date())
+                    .in(WorkerPolicy::getOrderId,list.stream().map(PolicyOrder::getId).collect(Collectors.toList()))
+                    .ne(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
+                    .set(WorkerPolicy::getStatus,PolicyOrderStatusEnum.BZZ.getKey())
+                    .update();
+        }
+
 
         policyOrderService.lambdaUpdate()
                 .ge(PolicyOrder::getEndTime,new Date())
                 .le(PolicyOrder::getStartTime,new Date())
+                .eq(PolicyOrder::getIsReceipt,IsYesNoEnum.YES.getKey())
                 .ne(PolicyOrder::getPolicyOrderStatus,PolicyOrderStatusEnum.BZZ.getKey())
                 .set(PolicyOrder::getPolicyOrderStatus,PolicyOrderStatusEnum.BZZ.getKey())
                 .update();
 
+
+
     }
 
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -140,7 +140,8 @@ public class PolicyOrderLogic {
             policyOrder.setStartTime(DateUtil.parse((String) row.get(9), "yyyy-MM-dd"));
             policyOrder.setEndTime(DateUtil.endOfDay(DateUtil.parse((String) row.get(10), "yyyy-MM-dd")));
             policyOrder.setClassWebsitId((String) row.get(11));
-            policyOrder.setClassWebsitId((String) row.get(12));
+            policyOrder.setClassWebsitName((String) row.get(12));
+            policyOrder.setPayAmount((BigDecimal) row.get(8));
 
 
             if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))