需求

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

@@ -1,6 +1,7 @@
 package com.gree.mall.miniapp.logic.policy;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -320,23 +321,29 @@ public class WorkerLogic {
         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(!CollectionUtils.isEmpty(policyIds),Policy::getId,policyIds)
-                .le(!CollectionUtils.isEmpty(policyIds),Policy::getEndTime,policyOrderList.get(0).getEndTime())
+        Policy policy = policyService.lambdaQuery()
+                .in(Policy::getId, policyWebsits.stream().map(PolicyWebsit::getPolicyId).collect(Collectors.toList()))
+                .notIn(CollectionUtil.isNotEmpty(policyIds), Policy::getId, policyIds)
+                .le(CollectionUtil.isNotEmpty(policyOrderList), Policy::getEndTime, CollectionUtil.isNotEmpty(policyOrderList)?policyOrderList.get(0).getEndTime():null)
                 .eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
-                .le(Policy::getPolicyStartTime,new Date())
-                .ge(Policy::getEndTime,new Date())
+                .le(Policy::getPolicyStartTime, new Date())
+                .ge(Policy::getEndTime, new Date())
                 .orderByDesc(Policy::getEndTime)
-                .last("limit 1")
-                .page(new Page<>(pageNum, pageSize));
+                .last("limit 1").one();
 
+        Page<Policy> objectPage = new Page<>();
 
+        if (policy == null)
+            return objectPage;
 
+        List<Policy> policies = new ArrayList<>();
+        policies.add(policy);
+        objectPage.setPages(1);
+        objectPage.setTotal(1);
+        objectPage.setCurrent(1);
+        objectPage.setRecords(policies);
 
-        return page;
+        return objectPage;
     }
 
     public PolicyDetail detail(String id) {