需求

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

@@ -41,12 +41,12 @@ public class WorkerController {
 
     @PostMapping("/myPolicy")
     @ApiOperation("我的意外保险")
-    public ResponseHelper<Page<WorkerPolicy>> myPolicy(
+    public ResponseHelper<Page<PolicyOrder>> myPolicy(
 
             @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(pageNum,pageSize);
+        Page<PolicyOrder> workerPolicies = workerLogic.myPolicy(pageNum,pageSize);
         return ResponseHelper.success(workerPolicies);
     }
 

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

@@ -193,7 +193,7 @@ public class WorkerLogic {
     }
 
 
-    public Page<WorkerPolicy> myPolicy(Integer pageNum, Integer pageSize) {
+    public Page<PolicyOrder> myPolicy(Integer pageNum, Integer pageSize) {
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
@@ -204,10 +204,10 @@ public class WorkerLogic {
         if (CollectionUtils.isEmpty(collect))
             return new Page<>();
 
-        Page<WorkerPolicy> page = workerPolicyService.lambdaQuery()
-                .in(WorkerPolicy::getWebsitUserId,collect)
-                .eq(WorkerPolicy::getPolicyType,"AC")
-                .eq(WorkerPolicy::getType,"IN")
+        Page<PolicyOrder> page = policyOrderService.lambdaQuery()
+                .in(PolicyOrder::getWebsitUserId,collect)
+                .eq(PolicyOrder::getType,"AC")
+                .eq(PolicyOrder::getIsPay,IsYesNoEnum.YES.getKey())
                 .page(new Page<>(pageNum, pageSize));
 
 

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

@@ -620,7 +620,7 @@ public class WorkerManagerLogic {
         policyOrder.setWorkerIdcard(workerManagerBean.getUser().getIdCard());
         policyOrder.setWorkerMobile(workerManagerBean.getUser().getMobile());
         policyOrder.setBuyUnitId(belongCompany.getDictCode());
-        policyOrder.setBuyUnit(adminWebsit.getInsureSteadUnit());
+        policyOrder.setBuyUnit(belongCompany.getDictValue());
 
         policyOrder.setWebsitUserId(workerManagerBean.getId());
         policyOrder.setType("IN");