需求

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

@@ -319,7 +319,7 @@ public class WorkerLogic {
         List<String> policyIds = policyOrderList.stream().map(PolicyOrder::getPolicyId).collect(Collectors.toList());
 
         WorkerPolicy workerPolicy = workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId, websitUser.getId())
-                .eq(WorkerPolicy::getType, "AC")
+                .eq(WorkerPolicy::getPolicyType, "AC")
                 .orderByDesc(WorkerPolicy::getEndTime)
                 .last("limit 1").one();
 
@@ -346,7 +346,7 @@ public class WorkerLogic {
         Policy policy = policyService.lambdaQuery()
                 .in(Policy::getId, policyWebsits.stream().map(PolicyWebsit::getPolicyId).collect(Collectors.toList()))
                 .notIn(CollectionUtil.isNotEmpty(policyIds), Policy::getId, policyIds)
-                .ge(endTime != null, Policy::getEndTime,endTime)
+                .gt(endTime != null, Policy::getEndTime,endTime)
                 .eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
                 .le(Policy::getPolicyStartTime, new Date())
                 .ge(Policy::getEndTime, new Date())