需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -88,7 +88,7 @@ public class CommonLogic {
             token = request.getParameter("x-token");
         }
 
-       // log.info("打印token："+token);
+        log.info("打印token："+token);
         AdminCompanyWechat adminCompanyWechat;
         User user = null;
 

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

@@ -133,13 +133,12 @@ public class WorkerLogic {
                 workerReminds.add(workerRemind);
             }
 
-            // 购买的意外险，按配置后过期 每天提醒一次
+            // 购买的意外险，按配置后过期
             if (  workerPolicyService.lambdaQuery()
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .in(WorkerPolicy::getStatus,"DSX","BZZ")
                     .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),mailbox.getOverNum()))
                     .eq(WorkerPolicy::getPolicyType,"AC")
-                    .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
                     .count() > 0
                     &&
                     workerPolicyService.lambdaQuery()
@@ -166,7 +165,6 @@ public class WorkerLogic {
                         .in(WorkerPolicy::getStatus,"DSX","BZZ")
                         .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),mailbox.getOverNum()))
                         .eq(WorkerPolicy::getPolicyType,"AC")
-                        .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
                         .list();
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
@@ -198,8 +196,6 @@ public class WorkerLogic {
                     .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
                     .eq(WorkerPolicy::getPolicyType,"AC")
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                    .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
-
                     .count() > 0
 
                     &&
@@ -312,25 +308,34 @@ public class WorkerLogic {
         if (CollectionUtils.isEmpty(policyWebsits))
             return new Page<>();
 
-/*        List<PolicyOrder> policyOrderList = policyOrderService
+        List<PolicyOrder> policyOrderList = policyOrderService
                 .lambdaQuery()
                 .eq(PolicyOrder::getType, "AC")
                 .isNotNull(PolicyOrder::getPolicyId)
+                .eq(PolicyOrder::getIsPay,IsYesNoEnum.YES.getKey())
                 .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
-                .list();*/
+                .orderByDesc(PolicyOrder::getEndTime)
+                .list();
+
+        List<String> policyIds = policyOrderList.stream().map(PolicyOrder::getPolicyId).collect(Collectors.toList());
+
 
-       // List<String> policyIds = policyOrderList.stream().map(PolicyOrder::getPolicyId).collect(Collectors.toList());
 
 
         Page<Policy> page = policyService.lambdaQuery()
                 .in(Policy::getId,policyWebsits.stream().map(PolicyWebsit::getPolicyId).collect(Collectors.toList()))
-              //  .notIn(Policy::getId,policyIds)
+                .notIn(!CollectionUtils.isEmpty(policyIds),Policy::getId,policyIds)
+                .le(!CollectionUtils.isEmpty(policyIds),Policy::getEndTime,policyOrderList.get(0).getEndTime())
                 .eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
                 .le(Policy::getPolicyStartTime,new Date())
                 .ge(Policy::getEndTime,new Date())
+                .orderByDesc(Policy::getEndTime)
+                .last("limit 1")
                 .page(new Page<>(pageNum, pageSize));
 
 
+
+
         return page;
     }