‘linchangsheng’ 3 months ago
parent
commit
d66e566aa8

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

@@ -154,6 +154,7 @@ public class WorkerLogic {
                             .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
 
@@ -214,6 +215,7 @@ public class WorkerLogic {
                             .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
 
@@ -309,7 +311,7 @@ public class WorkerLogic {
         Page<Policy> page = policyService.lambdaQuery()
                 .in(Policy::getId,policyWebsits.stream().map(PolicyWebsit::getPolicyId).collect(Collectors.toList()))
                 .eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
-                .le(Policy::getStartTime,new Date())
+                .le(Policy::getPolicyStartTime,new Date())
                 .ge(Policy::getEndTime,new Date())
                 .page(new Page<>(pageNum, pageSize));