需求

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

@@ -169,6 +169,12 @@ public class WorkerLogic {
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
 
                 for (WorkerPolicy workerPolicy : list) {
+
+                    if (websitUserService.lambdaQuery().in(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.WAIT_WORKER.getKey())
+                            .eq(WebsitUser::getId,workerPolicy.getWebsitUserId()).count() > 0) {
+                        continue;
+                    }
+
                     WorkerRemind workerRemind = new WorkerRemind();
                     workerRemind.setWebsitId(websitUser.getWebsitId());
                     workerRemind.setWebsitName(adminWebsit.getName());
@@ -492,14 +498,33 @@ public class WorkerLogic {
 
         List<AdminWebsit> adminWebsits = new ArrayList<>();
         for (WebsitUser websitUser : websitUsers) {
-            if (workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+            if ((workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .in(WorkerPolicy::getStatus,"BZZ","DSX").count() < 1 ||
                     workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                             .eq(WorkerPolicy::getPolicyType,"AC")
                             .in(WorkerPolicy::getStatus,"BZZ","DSX")
                             .le(WorkerPolicy::getEndTime,DateUtil.endOfDay(DateUtil.offsetDay(new Date(),mailbox.getOverNum())))
-                            .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
+
+
+            ) {
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
                 adminWebsits.add(adminWebsit);
             }