需求

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

@@ -1267,6 +1267,15 @@ public class UserLogic {
             websitUser.setExamineStatus(OrderExamineEnum.WAIT.toString());
             websitUser.setBankAccount(bankAccount);
             websitUser.insert();
+
+            userApplyBean.getWorkerPolicy().setWebsitUserId(websitUser.getId());
+            userApplyBean.getWorkerPolicy().setWebsitId(websitUser.getWebsitId());
+            userApplyBean.getWorkerPolicy().setWebsitName(websitUser.getWebsitName());
+            userApplyBean.getWorkerPolicy().setWorkerName(user.getNickName());
+            userApplyBean.getWorkerPolicy().setType("AC");
+            userApplyBean.getWorkerPolicy().setStatus("YSX");
+            userApplyBean.getWorkerPolicy().setWorkerId(websitUser.getWorkerNumber());
+
         }
 
         if (StringUtils.isNotBlank(idCard) && idCard.length() != 18) {
@@ -1298,8 +1307,9 @@ public class UserLogic {
             workerImgService.saveBatch(workerImgs);
         }
 
-        if (userApplyBean.getWorkerPolicy()!= null)
+        if (userApplyBean.getWorkerPolicy()!= null) {
             userApplyBean.getWorkerPolicy().insert();
+        }
     }
 
 

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

@@ -302,29 +302,37 @@ public class UserLogic {
             userWait.setBankAccount(brank);
             userWait.setWorkerNumber(workerNumber);
 
-            userWait.setNumber(hightNumber);
-            userWait.setStartTime( DateUtil.parse(hightStartTime, "yyyy/MM/dd"));
-            userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy/MM/dd"));
-            userWait.setHightExamineTime(DateUtil.parse(hightExamineTime,"yyyy/MM/dd"));
-            userWait.setCompany(company);
-
-            userWait.setCompany(company);
-            userWait.setPolicyStartTime(DateUtil.parse(policy_start_time,"yyyy/MM/dd"));
-            userWait.setPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(policy_end_time,"yyyy/MM/dd")));
-            userWait.setPolicyName(policy_name);
-            userWait.setPolicyOrder(policy_order);
-
-            userWait.setEmCompany(em_company);
-            userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time,"yyyy/MM/dd"));
-            userWait.setEmPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time,"yyyy/MM/dd")));
-            userWait.setEmPolicyName(em_policy_name);
-            userWait.setEmPolicyOrder(em_policy_order);
-
-            userWait.setInCompany(in_company);
-            userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time,"yyyy/MM/dd"));
-            userWait.setInPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time,"yyyy/MM/dd")));
-            userWait.setInPolicyName(in_policy_name);
-            userWait.setInPolicyOrder(in_policy_order);
+            if (!StringUtil.isEmpty(hightNumber)) {
+                userWait.setNumber(hightNumber);
+                userWait.setStartTime(DateUtil.parse(hightStartTime, "yyyy/MM/dd"));
+                userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy/MM/dd"));
+                userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy/MM/dd"));
+            }
+
+
+            if (!StringUtil.isEmpty(company)) {
+                userWait.setCompany(company);
+                userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy/MM/dd"));
+                userWait.setPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy/MM/dd")));
+                userWait.setPolicyName(policy_name);
+                userWait.setPolicyOrder(policy_order);
+            }
+
+            if (!StringUtil.isEmpty(em_company)) {
+                userWait.setEmCompany(em_company);
+                userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time, "yyyy/MM/dd"));
+                userWait.setEmPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy/MM/dd")));
+                userWait.setEmPolicyName(em_policy_name);
+                userWait.setEmPolicyOrder(em_policy_order);
+            }
+
+            if (!StringUtil.isEmpty(in_company)) {
+                userWait.setInCompany(in_company);
+                userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time, "yyyy/MM/dd"));
+                userWait.setInPolicyEndTime(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy/MM/dd")));
+                userWait.setInPolicyName(in_policy_name);
+                userWait.setInPolicyOrder(in_policy_order);
+            }
 
             userWaits.add(userWait);
         }