no message

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

@@ -265,12 +265,12 @@ public class UserLogic {
             String hightExamineTime = (String) row.get(11);
             String company = (String) row.get(12);
             String policy_name = (String) row.get(13);
-            String  policy_order= (String) row.get(14);
+            String policy_order = (String) row.get(14);
             String policy_start_time = (String) row.get(15);
             String policy_end_time = (String) row.get(16);
 
 
-            if (StringUtils.isAnyBlank(name, mobile, websitNumber,idcard,idcardStartTime,idcardEndTime)) {
+            if (StringUtils.isAnyBlank(name, mobile, websitNumber, idcard, idcardStartTime, idcardEndTime)) {
                 throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
             }
             if (mobile.length() != 11) {
@@ -308,24 +308,24 @@ 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(errPrefix+idcard + "该师傅已有入驻信息");
+                    throw new RemoteServiceException(errPrefix + idcard + "该师傅已有入驻信息");
             }
 
 
             if (adminWebsit.getInsureType().equals("意外险,工伤险")) {
 
-                String in_company = row.size() > 22?(String) row.get(22):"";
-                String in_policy_name = row.size() > 22?(String) row.get(23):"";
-                String in_policy_order = row.size() > 22?(String) row.get(24):"";
-                String in_policy_start_time = row.size() > 22?(String) row.get(25):"";
-                String in_policy_end_time = row.size() > 22?(String) row.get(26):"";
+                String in_company = row.size() > 22 ? (String) row.get(22) : "";
+                String in_policy_name = row.size() > 22 ? (String) row.get(23) : "";
+                String in_policy_order = row.size() > 22 ? (String) row.get(24) : "";
+                String in_policy_start_time = row.size() > 22 ? (String) row.get(25) : "";
+                String in_policy_end_time = row.size() > 22 ? (String) row.get(26) : "";
 
                 if (!StringUtil.isEmpty(in_company)) {
                     userWait.setInCompany(in_company);
                     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));
+                    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(errPrefix+userWait.getIdcard()+"导入师傅保险已过期");
+                        throw new RemoteServiceException(errPrefix + userWait.getIdcard() + "导入师傅保险已过期");
                     userWait.setInPolicyName(in_policy_name);
                     userWait.setInPolicyOrder(in_policy_order);
 
@@ -341,10 +341,10 @@ public class UserLogic {
                     userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(in_policy_end_time, "yyyy-MM-dd")));
 
                     if (userWaitPolicy.getStartTime().after(userWaitPolicy.getEndTime()))
-                        throw new RemoteServiceException(userWait.getMobile()+"开始时间不能大于结束时间");
+                        throw new RemoteServiceException(userWait.getMobile() + "开始时间不能大于结束时间");
 
-                    if (!this.areInSameMonth(userWaitPolicy.getStartTime(),userWaitPolicy.getEndTime()))
-                        throw new RemoteServiceException(userWait.getMobile()+"工伤险的有效时间必须在同一个月内");
+                    if (!this.areInSameMonth(userWaitPolicy.getStartTime(), userWaitPolicy.getEndTime()))
+                        throw new RemoteServiceException(userWait.getMobile() + "工伤险的有效时间必须在同一个月内");
 
 
                     userWaitPolicies.add(userWaitPolicy);
@@ -352,11 +352,11 @@ public class UserLogic {
 
 
                 if (StringUtil.isEmpty(in_company))
-                    throw new RemoteServiceException(errPrefix+userWait.getIdcard()+"必须导入工伤险");
-            }else {
+                    throw new RemoteServiceException(errPrefix + userWait.getIdcard() + "必须导入工伤险");
+            } else {
 
                 String em_company = (String) row.get(17);
-                String  em_policy_name= (String) row.get(18);
+                String em_policy_name = (String) row.get(18);
                 String em_policy_order = (String) row.get(19);
                 String em_policy_start_time = (String) row.get(20);
                 String em_policy_end_time = (String) row.get(21);
@@ -365,10 +365,10 @@ public class UserLogic {
                 if (!StringUtil.isEmpty(em_company)) {
                     userWait.setEmCompany(em_company);
                     userWait.setEmPolicyStartTime(DateUtil.parse(em_policy_start_time, "yyyy-MM-dd"));
-                    userWait.setEmPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(em_policy_end_time, "yyyy-MM-dd")),-1));
+                    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(errPrefix+userWait.getIdcard()+"导入师傅保险已过期");
+                        throw new RemoteServiceException(errPrefix + userWait.getIdcard() + "导入师傅保险已过期");
                     userWait.setEmPolicyName(em_policy_name);
                     userWait.setEmPolicyOrder(em_policy_order);
 
@@ -390,72 +390,70 @@ public class UserLogic {
                 }
 
 
-
                 if (StringUtil.isEmpty(em_company))
-                    throw new RemoteServiceException(errPrefix+userWait.getIdcard()+"必须导入雇主险");
+                    throw new RemoteServiceException(errPrefix + userWait.getIdcard() + "必须导入雇主险");
             }
 
 
+            if (!StringUtil.isEmpty(company)) {
+                userWait.setCompany(company);
 
-                if (!StringUtil.isEmpty(company)) {
-                    userWait.setCompany(company);
+                userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")), -1));
 
-                    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() + "导入师傅保险已过期");
 
-                    if (userWait.getPolicyEndTime().before(new Date()))
-                        throw new RemoteServiceException(errPrefix+userWait.getIdcard() + "导入师傅保险已过期");
+                userWait.setPolicyName(policy_name);
+                userWait.setPolicyOrder(policy_order);
 
-                    userWait.setPolicyName(policy_name);
-                    userWait.setPolicyOrder(policy_order);
 
+                UserWaitPolicy userWaitPolicy = new UserWaitPolicy();
 
-                    UserWaitPolicy userWaitPolicy = new UserWaitPolicy();
-
-                    userWaitPolicy.setType("LINE");
-                    userWaitPolicy.setPolicyType("AC");
-                    userWaitPolicy.setUserWaitId(userWait.getId());
-                    userWaitPolicy.setCompany(company);
-                    userWaitPolicy.setPolicyName(policy_name);
-                    userWaitPolicy.setPolicyOrder(policy_order);
+                userWaitPolicy.setType("LINE");
+                userWaitPolicy.setPolicyType("AC");
+                userWaitPolicy.setUserWaitId(userWait.getId());
+                userWaitPolicy.setCompany(company);
+                userWaitPolicy.setPolicyName(policy_name);
+                userWaitPolicy.setPolicyOrder(policy_order);
 
 
-                    try {
-                        userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
-                        userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
-                        userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
+                try {
+                    userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                    userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                    userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
 
-                    }catch (Exception e){
-                        throw new RemoteServiceException(errPrefix + "时间格式错误");
-                    }
+                } catch (Exception e) {
+                    throw new RemoteServiceException(errPrefix + "时间格式错误");
+                }
 
 
-                    userWaitPolicies.add(userWaitPolicy);
-                } else {
-                    throw new RemoteServiceException(errPrefix+userWait.getEmCompany() + "必须导入意外险");
-                }
+                userWaitPolicies.add(userWaitPolicy);
+            } else {
+                throw new RemoteServiceException(errPrefix + userWait.getEmCompany() + "必须导入意外险");
+            }
 
 
-                if (Objects.nonNull(adminWebsit)) {
-                    userWait.setWebsitId(adminWebsit.getWebsitId());
-                    userWait.setWebsitName(adminWebsit.getName());
-                    //入驻已存在的师傅到网点
-                    User worker = userService.lambdaQuery()
-                            .eq(User::getIdCard, idcard)
-                            .eq(User::getType, UserTypeEnum.WORKER.getKey())
-                            .last("limit 1")
-                            .one();
-                    if (Objects.nonNull(worker) ) {
-                        this.saveWebsitUser(adminWebsit.getWebsitId(), worker, brank, workerNumber, "系统导入初始化", userWait);
-                    }
+            if (Objects.nonNull(adminWebsit)) {
+                userWait.setWebsitId(adminWebsit.getWebsitId());
+                userWait.setWebsitName(adminWebsit.getName());
+                //入驻已存在的师傅到网点
+                User worker = userService.lambdaQuery()
+                        .eq(User::getIdCard, idcard)
+                        .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.setName(name);
+            userWait.setIdcard(idcard);
 
-                userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
-                userWait.setCompanyWechatName(adminUser.getCompanyName());
-                userWait.setBankAccount(brank);
-                userWait.setWorkerNumber(workerNumber);
+            userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
+            userWait.setCompanyWechatName(adminUser.getCompanyName());
+            userWait.setBankAccount(brank);
+            userWait.setWorkerNumber(workerNumber);
 
             try {
                 userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy-MM-dd"));
@@ -467,19 +465,19 @@ public class UserLogic {
                     userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy-MM-dd"));
                 }
 
-            }catch (Exception e){
+            } catch (Exception e) {
                 throw new RemoteServiceException(errPrefix + "时间格式错误");
             }
 
 
-            if (!StringUtil.isEmpty(userWait.getWorkerNumber()) && userWaitService.lambdaQuery().in(UserWait::getWorkerNumber,userWait.getWorkerNumber())
-                    .eq(UserWait::getWebsitId,userWait.getWebsitId()).count()
+            if (!StringUtil.isEmpty(userWait.getWorkerNumber()) && userWaitService.lambdaQuery().in(UserWait::getWorkerNumber, userWait.getWorkerNumber())
+                    .eq(UserWait::getWebsitId, userWait.getWebsitId()).count()
                     > 0)
-                throw new RemoteServiceException("不同师傅不能导入重复师傅编号，请检查"+userWait.getMobile()+"!");
+                throw new RemoteServiceException("不同师傅不能导入重复师傅编号，请检查" + userWait.getMobile() + "!");
 
 
             if (userWaits.stream().filter(item -> item.getWorkerNumber().equals(userWait.getWorkerNumber())).count() > 0) {
-                throw new RemoteServiceException("不同师傅不能导入重复师傅编号，请检查"+userWait.getMobile()+"!");
+                throw new RemoteServiceException("不同师傅不能导入重复师傅编号，请检查" + userWait.getMobile() + "!");
             }
 
             userWaits.add(userWait);