需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/WorkerController.java

@@ -44,11 +44,11 @@ public class WorkerController {
     @PostMapping("/myPolicy")
     @ApiOperation("我的意外保险")
     public ResponseHelper<Page<WorkerPolicy>> myPolicy(
-            @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId,
+
             @ApiParam(required = true, value = "pageNum") @RequestParam(required = true) Integer pageNum,
             @ApiParam(required = true, value = "pageSize") @RequestParam(required = true)Integer pageSize
     ){
-        Page<WorkerPolicy> workerPolicies = workerLogic.myPolicy(userId,pageNum,pageSize);
+        Page<WorkerPolicy> workerPolicies = workerLogic.myPolicy(pageNum,pageSize);
         return ResponseHelper.success(workerPolicies);
     }
 

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

@@ -154,10 +154,12 @@ public class WorkerLogic {
     }
 
 
-    public Page<WorkerPolicy> myPolicy(String userId, Integer pageNum, Integer pageSize) {
+    public Page<WorkerPolicy> myPolicy(Integer pageNum, Integer pageSize) {
+
+        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
         Page<WorkerPolicy> page = workerPolicyService.lambdaQuery()
-                .eq(WorkerPolicy::getWorkerId,userId)
+                .eq(WorkerPolicy::getWorkerId,currentCompanyWechat.getUserId())
                 .eq(WorkerPolicy::getPolicyType,"AC")
                 .eq(WorkerPolicy::getType,"IN")
                 .page(new Page<>(pageNum, pageSize));

mall-server-api/src/main/java/com/gree/mall/manager/enums/WorkerPolicyStatusEnum.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.enums;
+
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum  WorkerPolicyStatusEnum implements BaseEnum {
+
+    ON("ON", "保障中"),
+    WAIT_ON("WAIT_ON", "失效"),
+    OFF("OFF", "待生效"),
+
+    ;
+
+    private final String key;
+    private final String remark;
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -673,7 +673,6 @@ public class AgreementLogic {
                     .set(MailboxSendRecord::getReceiptStatus,IsYesNoEnum.YES.getKey())
                     .set(MailboxSendRecord::getReceiptTime,new Date()).update();
 
-
         }
 
 
@@ -692,4 +691,11 @@ public class AgreementLogic {
         }
 
     }
+
+    public void offInsure() {
+        workerPolicyService.lambdaUpdate()
+                .le(WorkerPolicy::getEndTime,new Date())
+                .eq(WorkerPolicy::getStatus,WorkerPolicyStatusEnum.OFF.getKey()).update();
+
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/InsureEmailSchedule.java

@@ -38,10 +38,19 @@ public class InsureEmailSchedule {
     }
 
 
-/*    //保险过期
+    //保险过期/生效
     @Scheduled(fixedDelay = 60*60* 1000)
     public void task3(){
         agreementLogic.offInsure();
-    }*/
+    }
+
+    //保险过期/生效
+/*
+    @Scheduled(fixedDelay = 60*60* 1000)
+    public void task4(){
+        agreementLogic.task4();
+    }
+*/
+
 
 }