需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/policy/WorkerRemind.java

@@ -16,7 +16,7 @@ public class WorkerRemind {
     @ApiModelProperty("网点id")
     private String websitId;
 
-    @ApiModelProperty("1保险购买提示，2意外到期提醒，3意外已到期")
+    @ApiModelProperty("1保险购买提示，2意外到期提醒，3意外已到期 ,4保险待审")
     private Integer remindIn;
 
     @ApiModelProperty("过期时间")

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

@@ -102,6 +102,23 @@ public class WorkerLogic {
                 workerReminds.add(workerRemind);
             }
 
+            if (websitUser.getExamineStatus().equals(ExamineWorkerStatusEnum.WAIT_WORKER.getKey()) &&
+                    workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .in(WorkerPolicy::getStatus,"DSX","BZZ")
+                            .eq(WorkerPolicy::getPolicyType,"AC")
+                            .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .count() > 0) {
+
+                AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
+
+                WorkerRemind workerRemind = new WorkerRemind();
+                workerRemind.setWebsitId(websitUser.getWebsitId());
+                workerRemind.setWebsitName(adminWebsit.getName());
+                workerRemind.setRemindIn(4);
+
+                workerReminds.add(workerRemind);
+            }
+
             // 购买的意外险，七天后过期 每天提醒一次
             if (  workerPolicyService.lambdaQuery()
                     .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
@@ -319,7 +336,7 @@ public class WorkerLogic {
 
         BigDecimal price = this.getPayPrice(integer,policy);
 
-        policyOrder.setPayAmount(policy.getPolicyPrice().multiply(price));
+        policyOrder.setPayAmount(policy.getPolicyPrice().multiply(price).setScale(2, BigDecimal.ROUND_HALF_UP));
 
         policyOrder.setIsSend(IsYesNoEnum.NO.getKey());
         policyOrder.setIsReceipt(IsYesNoEnum.NO.getKey());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -377,8 +377,8 @@ public class UserLogic {
                         workerPolicy.setWorkerId(websitUser.getWorkerNumber());
                         workerPolicy.setType("LINE");
                         workerPolicy.setOrderId(userWait.getEmPolicyOrder());
-                        workerPolicy.setPolicyName(userWait.getPolicyName());
-                        workerPolicy.setCompany(userWait.getCompany());
+                        workerPolicy.setPolicyName(userWait.getEmPolicyName());
+                        workerPolicy.setCompany(userWait.getEmCompany());
                         workerPolicy.setPolicyOrder(userWait.getEmPolicyOrder());
                         workerPolicy.setPolicyType("EM");
                         workerPolicy.setStartTime(userWait.getEmPolicyStartTime());
@@ -406,8 +406,8 @@ public class UserLogic {
                         workerPolicy.setWorkerId(websitUser.getWorkerNumber());
                         workerPolicy.setType("LINE");
                         workerPolicy.setOrderId(userWait.getInPolicyOrder());
-                        workerPolicy.setPolicyName(userWait.getPolicyName());
-                        workerPolicy.setCompany(userWait.getCompany());
+                        workerPolicy.setPolicyName(userWait.getInPolicyName());
+                        workerPolicy.setCompany(userWait.getInCompany());
                         workerPolicy.setPolicyOrder(userWait.getInPolicyOrder());
                         workerPolicy.setPolicyType("IN");
                         workerPolicy.setStartTime(userWait.getInPolicyStartTime());

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -52,8 +52,6 @@ public class UserVO   {
     @ApiModelProperty("身份证")
     private String idCard;
 
-    @ApiModelProperty("身份证图片")
-    private String idCardImg;
 
     @ZfireField(hide = true, tbName = "b")
     private String slaveWorkerId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/PolicyOrderVO.java

@@ -30,7 +30,7 @@ public class PolicyOrderVO  {
     private String policyName;
 
     @ApiModelProperty(value = "保单编号")
-    private String policyOrderId;
+    private String policyNumber;
 
     @ApiModelProperty(value = "所属公司")
     private String belongCompany;

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

@@ -177,6 +177,11 @@ public class WorkerManagerLogic {
     @Transactional(rollbackFor = Exception.class)
     public void examineWait(WorkerManagerBean workerManagerBean) {
 
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        workerManagerBean.setExamineBy(adminUser.getNickName());
+        workerManagerBean.setExamineTime(new Date());
+
         workerManagerBean.setWorkerNumber(workerManagerBean.getUser().getWorkerNumber());
         User user = userService.getById(workerManagerBean.getUserId());
 
@@ -448,7 +453,9 @@ public class WorkerManagerLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void examine(WorkerManagerBean workerManagerBean) {
-
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        workerManagerBean.setPolicyExamineBy(adminUser.getNickName());
+        workerManagerBean.setPolicyExamineTime(new Date());
 
 
         workerManagerBean.updateById();

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -297,6 +297,8 @@ public class UserLogic {
 
             userWait.setName(name);
             userWait.setIdcard(idcard);
+            userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy/MM/dd"));
+            userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy/MM/dd"));
             userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
             userWait.setCompanyWechatName(adminUser.getCompanyName());
             userWait.setBankAccount(brank);
@@ -309,6 +311,15 @@ public class UserLogic {
                 userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy/MM/dd"));
             }
 
+            if (adminWebsit.getInsureType().equals("意外险,工伤险")) {
+
+                if (StringUtil.isEmpty(in_company))
+                    throw new RemoteServiceException(userWait.getWorkerNumber()+"必须导入工伤险");
+            }else {
+                if (StringUtil.isEmpty(em_company))
+                    throw new RemoteServiceException(userWait.getEmCompany()+"必须导入雇主险");
+            }
+
 
             if (!StringUtil.isEmpty(company)) {
                 userWait.setCompany(company);
@@ -316,6 +327,8 @@ public class UserLogic {
                 userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy/MM/dd")),-1));
                 userWait.setPolicyName(policy_name);
                 userWait.setPolicyOrder(policy_order);
+            }else {
+                throw new RemoteServiceException(userWait.getEmCompany()+"必须导入意外险");
             }
 
             if (!StringUtil.isEmpty(em_company)) {