‘linchangsheng’ 3 months ago
parent
commit
22c2560b5d

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

@@ -301,15 +301,30 @@ public class WorkerLogic {
 
     public Page<Policy> policy(String websitId,Integer pageNum, Integer pageSize) {
 
+        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
+
+        WebsitUser websitUser = websitUserService.lambdaQuery()
+                .eq(WebsitUser::getWebsitId, websitId)
+                .eq(WebsitUser::getUserId, currentCompanyWechat.getUserId()).last("limit 1").one();
+
         List<PolicyWebsit> policyWebsits = policyWebsitService.lambdaQuery().eq(PolicyWebsit::getWebsitId, websitId).list();
 
         if (CollectionUtils.isEmpty(policyWebsits))
             return new Page<>();
 
+/*        List<PolicyOrder> policyOrderList = policyOrderService
+                .lambdaQuery()
+                .eq(PolicyOrder::getType, "AC")
+                .isNotNull(PolicyOrder::getPolicyId)
+                .eq(PolicyOrder::getWebsitUserId, websitUser.getId())
+                .list();*/
+
+       // 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)
                 .eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
                 .le(Policy::getPolicyStartTime,new Date())
                 .ge(Policy::getEndTime,new Date())