需求

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

@@ -532,6 +532,8 @@ public class WorkerLogic {
 
         List<AdminWebsit> adminWebsits = new ArrayList<>();
         for (WebsitUser websitUser : websitUsers) {
+
+            //保障，生效小于1 或 保障待生效，时间小于过期提醒  且  订单保障待生效 小于1
             if ((workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .in(WorkerPolicy::getStatus,"BZZ","DSX").count() < 1 ||
@@ -542,18 +544,11 @@ public class WorkerLogic {
                             .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::getIsPay,IsYesNoEnum.YES.getKey())
                             .eq(PolicyOrder::getWebsitUserId,websitUser.getId())
                             .count() < 1