Merge remote-tracking branch 'origin/develop' into develop

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

@@ -300,7 +300,7 @@ public class UserLogic {
                 User user = userList.get(0);
                 if (websitUserService.lambdaQuery().eq(WebsitUser::getWebsitId, adminWebsit.getWebsitId())
                         .eq(WebsitUser::getUserId, user.getUserId()).count() > 0)
-                    throw new RemoteServiceException(idcard + "该师傅已有入驻信息");
+                    throw new RemoteServiceException(errPrefix+idcard + "该师傅已有入驻信息");
             }
 
 
@@ -317,7 +317,7 @@ public class UserLogic {
                     userWait.setInPolicyStartTime(DateUtil.parse(in_policy_start_time, "yyyy-MM-dd"));
                     userWait.setInPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(in_policy_end_time, "yyyy-MM-dd")),-1));
                     if (userWait.getInPolicyEndTime().before(new Date()))
-                        throw new RemoteServiceException(userWait.getIdcard()+"导入师傅保险已过期");
+                        throw new RemoteServiceException(errPrefix+userWait.getIdcard()+"导入师傅保险已过期");
                     userWait.setInPolicyName(in_policy_name);
                     userWait.setInPolicyOrder(in_policy_order);
 
@@ -335,7 +335,7 @@ public class UserLogic {
 
 
                 if (StringUtil.isEmpty(in_company))
-                    throw new RemoteServiceException(userWait.getIdcard()+"必须导入工伤险");
+                    throw new RemoteServiceException(errPrefix+userWait.getIdcard()+"必须导入工伤险");
             }else {
 
                 String em_company = (String) row.get(17);
@@ -351,7 +351,7 @@ public class UserLogic {
                     userWait.setEmPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy-MM-dd")),-1));
 
                     if (userWait.getEmPolicyEndTime().before(new Date()))
-                        throw new RemoteServiceException(userWait.getIdcard()+"导入师傅保险已过期");
+                        throw new RemoteServiceException(errPrefix+userWait.getIdcard()+"导入师傅保险已过期");
                     userWait.setEmPolicyName(em_policy_name);
                     userWait.setEmPolicyOrder(em_policy_order);
 
@@ -372,65 +372,71 @@ public class UserLogic {
 
 
                 if (StringUtil.isEmpty(em_company))
-                    throw new RemoteServiceException(userWait.getIdcard()+"必须导入雇主险");
+                    throw new RemoteServiceException(errPrefix+userWait.getIdcard()+"必须导入雇主险");
             }
 
 
-            if (!StringUtil.isEmpty(company)) {
-                userWait.setCompany(company);
-                userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
-                userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")),-1));
+            try {
 
-                if (userWait.getPolicyEndTime().before(new Date()))
-                    throw new RemoteServiceException(userWait.getIdcard()+"导入师傅保险已过期");
 
-                userWait.setPolicyName(policy_name);
-                userWait.setPolicyOrder(policy_order);
+                if (!StringUtil.isEmpty(company)) {
+                    userWait.setCompany(company);
+                    userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                    userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")), -1));
 
+                    if (userWait.getPolicyEndTime().before(new Date()))
+                        throw new RemoteServiceException(errPrefix+userWait.getIdcard() + "导入师傅保险已过期");
 
-                UserWaitPolicy userWaitPolicy = new UserWaitPolicy();
+                    userWait.setPolicyName(policy_name);
+                    userWait.setPolicyOrder(policy_order);
 
-                userWaitPolicy.setUserWaitId(userWait.getId());
-                userWaitPolicy.setCompany(company);
-                userWaitPolicy.setPolicyName(policy_name);
-                userWaitPolicy.setPolicyOrder(policy_order);
-                userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
-                userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
 
-                userWaitPolicies.add(userWaitPolicy);
-            }else {
-                throw new RemoteServiceException(userWait.getEmCompany()+"必须导入意外险");
-            }
+                    UserWaitPolicy userWaitPolicy = new UserWaitPolicy();
 
+                    userWaitPolicy.setUserWaitId(errPrefix+userWait.getId());
+                    userWaitPolicy.setCompany(company);
+                    userWaitPolicy.setPolicyName(policy_name);
+                    userWaitPolicy.setPolicyOrder(policy_order);
+                    userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                    userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
 
-            if (Objects.nonNull(adminWebsit)) {
-                userWait.setWebsitId(adminWebsit.getWebsitId());
-                userWait.setWebsitName(adminWebsit.getName());
-                //入驻已存在的师傅到网点
-                User worker = userService.lambdaQuery()
-                        .eq(User::getMobile, mobile)
-                        .eq(User::getType, UserTypeEnum.WORKER.getKey())
-                        .last("limit 1")
-                        .one();
-                if (Objects.nonNull(worker)) {
-                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, brank, workerNumber, "系统导入初始化",userWait);
+                    userWaitPolicies.add(userWaitPolicy);
+                } else {
+                    throw new RemoteServiceException(errPrefix+userWait.getEmCompany() + "必须导入意外险");
                 }
-            }
 
-            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);
-            userWait.setWorkerNumber(workerNumber);
-
-            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 (Objects.nonNull(adminWebsit)) {
+                    userWait.setWebsitId(adminWebsit.getWebsitId());
+                    userWait.setWebsitName(adminWebsit.getName());
+                    //入驻已存在的师傅到网点
+                    User worker = userService.lambdaQuery()
+                            .eq(User::getMobile, mobile)
+                            .eq(User::getType, UserTypeEnum.WORKER.getKey())
+                            .last("limit 1")
+                            .one();
+                    if (Objects.nonNull(worker)) {
+                        this.saveWebsitUser(adminWebsit.getWebsitId(), worker, brank, workerNumber, "系统导入初始化", userWait);
+                    }
+                }
+
+                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);
+                userWait.setWorkerNumber(workerNumber);
+
+                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"));
+                }
+            }catch (Exception e){
+                throw new RemoteServiceException(errPrefix + "时间格式错误");
             }