需求

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

@@ -112,6 +112,12 @@ public class UserLogic {
     @Resource
     SMSLogic smsLogic;
 
+    @Autowired
+    UserWaitPolicyService userWaitPolicyService;
+
+    @Autowired
+    UserWaitWorkerImgService userWaitWorkerImgService;
+
     /**
      * 微信小程序授权
      *
@@ -356,91 +362,97 @@ public class UserLogic {
                     websitUser.setWorkerNumber(userWait.getWorkerNumber());
                     websitUser.insert();
 
-                    //新意外增保险
-                    if (!StringUtil.isEmpty(userWait.getPolicyOrder())){
-                        WorkerPolicy workerPolicy = new WorkerPolicy();
-                        workerPolicy.setWorkerId(websitUser.getWorkerNumber());
-                        workerPolicy.setType("LINE");
-                        workerPolicy.setOrderId(userWait.getPolicyOrder());
-                        workerPolicy.setPolicyName(userWait.getPolicyName());
-                        workerPolicy.setCompany(userWait.getCompany());
-                        workerPolicy.setPolicyOrder(userWait.getPolicyOrder());
-                        workerPolicy.setPolicyType("AC");
-                        workerPolicy.setStartTime(userWait.getPolicyStartTime());
-                        workerPolicy.setEndTime(userWait.getPolicyEndTime());
-                        workerPolicy.setWebsitUserId(websitUser.getId());
-                        workerPolicy.setWebsitId(websitUser.getWebsitId());
-                        workerPolicy.setWebsitName(websitUser.getWebsitName());
-                        workerPolicy.setWorkerName(user.getNickName());
-
-                        if (new Date().after(userWait.getPolicyStartTime()) && new Date().before(userWait.getPolicyEndTime()))
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.BZZ.getKey());
-                        else if (new Date().after(userWait.getPolicyEndTime()))
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.YSX.getKey());
-                        else {
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.DSX.getKey());
+                    List<UserWaitPolicy> userWaitPolicies = userWaitPolicyService.lambdaQuery().eq(UserWaitPolicy::getUserWaitId, userWait.getId())
+                            .list();
+
+                    for (UserWaitPolicy userWaitPolicy : userWaitPolicies) {
+                        //新意外增保险
+                        if (userWaitPolicy.getPolicyType().equals("AC")){
+                            WorkerPolicy workerPolicy = new WorkerPolicy();
+                            workerPolicy.setWorkerId(websitUser.getWorkerNumber());
+                            workerPolicy.setType("LINE");
+                            workerPolicy.setOrderId(userWaitPolicy.getPolicyOrder());
+                            workerPolicy.setPolicyName(userWaitPolicy.getPolicyName());
+                            workerPolicy.setCompany(userWaitPolicy.getCompany());
+                            workerPolicy.setPolicyOrder(userWaitPolicy.getPolicyOrder());
+                            workerPolicy.setPolicyType("AC");
+                            workerPolicy.setStartTime(userWaitPolicy.getStartTime());
+                            workerPolicy.setEndTime(userWaitPolicy.getEndTime());
+                            workerPolicy.setWebsitUserId(websitUser.getId());
+                            workerPolicy.setWebsitId(websitUser.getWebsitId());
+                            workerPolicy.setWebsitName(websitUser.getWebsitName());
+                            workerPolicy.setWorkerName(user.getNickName());
+
+                            if (new Date().after(userWaitPolicy.getStartTime()) && new Date().before(userWaitPolicy.getEndTime()))
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.BZZ.getKey());
+                            else if (new Date().after(userWaitPolicy.getEndTime()))
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.YSX.getKey());
+                            else {
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.DSX.getKey());
+                            }
+                            workerPolicy.insert();
                         }
-                        workerPolicy.insert();
-                    }
 
 
-                    //新增雇主保险
-                    if (!StringUtil.isEmpty(userWait.getEmPolicyOrder())){
-                        WorkerPolicy workerPolicy = new WorkerPolicy();
-                        workerPolicy.setWorkerId(websitUser.getWorkerNumber());
-                        workerPolicy.setType("LINE");
-                        workerPolicy.setOrderId(userWait.getEmPolicyOrder());
-                        workerPolicy.setPolicyName(userWait.getEmPolicyName());
-                        workerPolicy.setCompany(userWait.getEmCompany());
-                        workerPolicy.setPolicyOrder(userWait.getEmPolicyOrder());
-                        workerPolicy.setPolicyType("EM");
-                        workerPolicy.setStartTime(userWait.getEmPolicyStartTime());
-                        workerPolicy.setEndTime(userWait.getEmPolicyEndTime());
-                        workerPolicy.setWebsitUserId(websitUser.getId());
-                        workerPolicy.setWebsitId(websitUser.getWebsitId());
-                        workerPolicy.setWebsitName(websitUser.getWebsitName());
-                        workerPolicy.setWorkerName(user.getNickName());
-
-                        if (new Date().after(workerPolicy.getStartTime()) && new Date().before(workerPolicy.getEndTime()))
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.BZZ.getKey());
-                        else if (new Date().after(workerPolicy.getEndTime()))
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.YSX.getKey());
-                        else {
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.DSX.getKey());
+                        //新增雇主保险
+                        if (userWaitPolicy.getPolicyType().equals("EM")){
+                            WorkerPolicy workerPolicy = new WorkerPolicy();
+                            workerPolicy.setWorkerId(websitUser.getWorkerNumber());
+                            workerPolicy.setType("LINE");
+                            workerPolicy.setOrderId(userWaitPolicy.getPolicyOrder());
+                            workerPolicy.setPolicyName(userWaitPolicy.getPolicyName());
+                            workerPolicy.setCompany(userWaitPolicy.getCompany());
+                            workerPolicy.setPolicyOrder(userWaitPolicy.getPolicyOrder());
+                            workerPolicy.setPolicyType("EM");
+                            workerPolicy.setStartTime(userWaitPolicy.getStartTime());
+                            workerPolicy.setEndTime(userWaitPolicy.getEndTime());
+                            workerPolicy.setWebsitUserId(websitUser.getId());
+                            workerPolicy.setWebsitId(websitUser.getWebsitId());
+                            workerPolicy.setWebsitName(websitUser.getWebsitName());
+                            workerPolicy.setWorkerName(user.getNickName());
+
+                            if (new Date().after(workerPolicy.getStartTime()) && new Date().before(workerPolicy.getEndTime()))
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.BZZ.getKey());
+                            else if (new Date().after(workerPolicy.getEndTime()))
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.YSX.getKey());
+                            else {
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.DSX.getKey());
+                            }
+
+                            workerPolicy.insert();
                         }
 
-                        workerPolicy.insert();
-                    }
-
 
-                    //新增工伤保险
-                    if (!StringUtil.isEmpty(userWait.getInPolicyOrder())){
-                        WorkerPolicy workerPolicy = new WorkerPolicy();
-                        workerPolicy.setWorkerId(websitUser.getWorkerNumber());
-                        workerPolicy.setType("LINE");
-                        workerPolicy.setOrderId(userWait.getInPolicyOrder());
-                        workerPolicy.setPolicyName(userWait.getInPolicyName());
-                        workerPolicy.setCompany(userWait.getInCompany());
-                        workerPolicy.setPolicyOrder(userWait.getInPolicyOrder());
-                        workerPolicy.setPolicyType("IN");
-                        workerPolicy.setStartTime(userWait.getInPolicyStartTime());
-                        workerPolicy.setEndTime(userWait.getInPolicyEndTime());
-                        workerPolicy.setWebsitUserId(websitUser.getId());
-                        workerPolicy.setWebsitId(websitUser.getWebsitId());
-                        workerPolicy.setWebsitName(websitUser.getWebsitName());
-                        workerPolicy.setWorkerName(user.getNickName());
-
-                        if (new Date().after(workerPolicy.getStartTime()) && new Date().before(workerPolicy.getEndTime()))
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.BZZ.getKey());
-                        else if (new Date().after(workerPolicy.getEndTime()))
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.YSX.getKey());
-                        else {
-                            workerPolicy.setStatus(PolicyOrderStutasEnum.DSX.getKey());
+                        //新增工伤保险
+                        if (userWaitPolicy.getPolicyType().equals("IN")){
+                            WorkerPolicy workerPolicy = new WorkerPolicy();
+                            workerPolicy.setWorkerId(websitUser.getWorkerNumber());
+                            workerPolicy.setType("LINE");
+                            workerPolicy.setOrderId(userWaitPolicy.getPolicyOrder());
+                            workerPolicy.setPolicyName(userWaitPolicy.getPolicyName());
+                            workerPolicy.setCompany(userWaitPolicy.getCompany());
+                            workerPolicy.setPolicyOrder(userWaitPolicy.getPolicyOrder());
+                            workerPolicy.setPolicyType("IN");
+                            workerPolicy.setStartTime(userWaitPolicy.getStartTime());
+                            workerPolicy.setEndTime(userWaitPolicy.getEndTime());
+                            workerPolicy.setWebsitUserId(websitUser.getId());
+                            workerPolicy.setWebsitId(websitUser.getWebsitId());
+                            workerPolicy.setWebsitName(websitUser.getWebsitName());
+                            workerPolicy.setWorkerName(user.getNickName());
+
+                            if (new Date().after(workerPolicy.getStartTime()) && new Date().before(workerPolicy.getEndTime()))
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.BZZ.getKey());
+                            else if (new Date().after(workerPolicy.getEndTime()))
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.YSX.getKey());
+                            else {
+                                workerPolicy.setStatus(PolicyOrderStutasEnum.DSX.getKey());
+                            }
+
+                            workerPolicy.insert();
                         }
-
-                        workerPolicy.insert();
                     }
 
+
                 }
             }
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -232,7 +232,7 @@ public class OrderBaseLogic {
         orderBase.setIsQdNotice(true);
         orderBase.setId(orderBaseId);
         orderBase.setIsImportExcel(orderBase.getIsImportExcel() != null?old.getIsImportExcel():false);
-        orderBase.setIsMeet(true);
+        orderBase.setIsMeet(orderAddBeanDTO.getIsMeet());
 
 
         //是否变更了师傅