需求

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

@@ -138,7 +138,24 @@ public class WorkerLogic {
                     .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),7))
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
-                    .count() > 0){
+                    .count() > 0
+                    &&
+                    workerPolicyService.lambdaQuery()
+                            .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .in(WorkerPolicy::getStatus,"DSX","BZZ")
+                            .eq(WorkerPolicy::getPolicyType,"AC")
+                            .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .count() < 1
+
+                    &&
+                    policyOrderService.lambdaQuery()
+                            .eq(PolicyOrder::getWebsitUserId,websitUser.getId())
+                            .in(PolicyOrder::getPolicyOrderStatus,"DSX","BZZ")
+                            .eq(PolicyOrder::getType,"AC")
+                            .eq(PolicyOrder::getWebsitUserId,websitUser.getId())
+                            .count() < 1
+
+            ){
 
 
                 List<WorkerPolicy> list = workerPolicyService.lambdaQuery()