企业认证修改字段

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -352,6 +352,19 @@ public class OwnAuthController extends BaseController {
                 return R.fail("经办人身份证国徽面不能为空");
             }
         }
+        String  scyId  =  null;
+        SysCompany sysCompany = new SysCompany();
+        if (use.getCompanyId() == null){
+            scyId  =  IdUtils.fastSimpleUUID();
+        } else {
+            scyId = use.getCompanyId();
+        }
+        SysCompany companyServices = sysCompanyService.getById(scyId);
+        if(companyServices!=null){
+            if("01".equals(companyServices.getScyType())&&(CommonUtil.isEmpty(operator)||CommonUtil.isEmpty(number))){
+                throw new Exception("核心企业需填写业务操作员信息!");
+            }
+        }
         //法人授权书
         List<Map<String,String>> frsqsList = (List<Map<String, String>>) map.get("frsqsList");
         //数字证书授权
@@ -360,13 +373,6 @@ public class OwnAuthController extends BaseController {
         List<Map<String,String>> qtfjList = (List<Map<String, String>>) map.get("qtfjList");
         //四要素跳过(00:下一步,01:跳过)
         String skip =CommonUtil.objToString(map.get("skip"));
-        String  scyId  =  null;
-        SysCompany sysCompany = new SysCompany();
-        if (use.getCompanyId() == null){
-            scyId  =  IdUtils.fastSimpleUUID();
-        } else {
-            scyId = use.getCompanyId();
-        }
         sysCompany.setScyId(scyId);
         sysCompany.setScyName(scyName);
         sysCompany.setScySocialCode(scySocialCode);
@@ -483,10 +489,6 @@ public class OwnAuthController extends BaseController {
             sysCompany.setUpdateBy(use.getUserId()+"");
             sysCompanyService.updateSysCompany(sysCompany);
         }
-       SysCompany companyServices = sysCompanyService.getById(scyId);
-        if("01".equals(companyServices.getScyType())&&(CommonUtil.isEmpty(operator)||CommonUtil.isEmpty(number))){
-            throw new Exception("核心企业需填写业务操作员信息!");
-        }
         //部门id
         SysDept dept = new SysDept();
         dept.setCompanyId(scyId);
@@ -604,9 +606,9 @@ public class OwnAuthController extends BaseController {
                 sysUser.setRoleIds(roleIds);
                 userService.insertUser(sysUser);
                 //发送注册成功短信
-                Map passwordMap =new HashMap();
-                passwordMap.put("password",password);
-                messageUtilsService.sendMessageCode(phoneNumber,zhucechenggong,passwordMap,null);
+//                Map passwordMap =new HashMap();
+//                passwordMap.put("password",password);
+//                messageUtilsService.sendMessageCode(phoneNumber,zhucechenggong,passwordMap,null);
                 handlerUser = userService.selectUserByUserName(phoneNumber);
                 //创建经办人与企业关系
                 SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
@@ -659,13 +661,17 @@ public class OwnAuthController extends BaseController {
             sysuserCompany.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
             sysuserCompany.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
             List<SysUserCompanyRel>  userCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(sysuserCompany);
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setUserId(use.getUserId());
+            sysUserRole.setRoleId(roleId);
+            List<SysUserRole>   userRole = sysUserRoleService.selectSysUserRoleList(sysUserRole);
             if(userCompanyRels.size()>0){
                 // 增加关系表数据
                 SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
                 sysUserCompanyRel.setSucrCompanyId(scyId);
                 sysUserCompanyRel.setSucrUserId(use.getUserId());
                 sysUserCompanyRel.setSucrDeptId(deptId);
-                sysUserCompanyRel.setSucrHandler("1");
+                sysUserCompanyRel.setSucrHandler(userCompanyRels.get(0).getSucrHandler());
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
                 }else{
@@ -677,13 +683,16 @@ public class OwnAuthController extends BaseController {
                 lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
                 lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
                 sysUserCompanyRelService.update(sysUserCompanyRel,lambdaQueryWrapper);
+            if(userRole.size()==0){
+                sysUserRoleService.selectSysUserRoleList(sysUserRole);
+            }
             }else{
                 // 增加关系表数据
                 SysUserCompanyRel sysUserCompanyRel = new SysUserCompanyRel();
                 sysUserCompanyRel.setSucrCompanyId(scyId);
                 sysUserCompanyRel.setSucrUserId(use.getUserId());
                 sysUserCompanyRel.setSucrDeptId(deptId);
-                sysUserCompanyRel.setSucrHandler("1");
+                sysUserCompanyRel.setSucrHandler("0");
                 if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
                     sysUserCompanyRel.setSucrCard(handlerCard);
                 }else{
@@ -692,6 +701,9 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
+                if(userRole.size()==0){
+                    sysUserRoleService.selectSysUserRoleList(sysUserRole);
+                }
             }
         }
         //创建其他和管理员
@@ -717,9 +729,9 @@ public class OwnAuthController extends BaseController {
                     user.setCreateBy(use.getUserId() + "");
                     userService.insertUser(user);
                     //发送注册成功短信
-                    Map passwordMap = new HashMap();
-                    passwordMap.put("password", password);
-                    messageUtilsService.sendMessageCode(phoneNumber, zhucechenggong, passwordMap, null);
+//                    Map passwordMap = new HashMap();
+//                    passwordMap.put("password", password);
+//                    messageUtilsService.sendMessageCode(phoneNumber, zhucechenggong, passwordMap, null);
                     operatorUser = userService.selectUserByUserName(number);
                 } else {
                     operatorUser.setNickName(operator);
@@ -744,8 +756,11 @@ public class OwnAuthController extends BaseController {
         redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, userInfo, Constants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
         //返回企业信息
         SysCompany company = sysCompanyService.getById(scyId);
-        String tittle = "【企业认证】"+scyName+"CFCA工商四要素认证失败，请联系用户"+phoneNumber+"线下核实企业信息；";
-       ownNoticeService.sendNotice(scyId,scyId,tittle,"00",null,"09","0","1",null, null, null);
+        if(company.getScyAuthStatus()=="02"){
+            String tittle = "【企业认证】"+scyName+"CFCA工商四要素认证失败，请联系用户"+phoneNumber+"线下核实企业信息；";
+            ownNoticeService.sendNotice(scyId,scyId,tittle,"00",null,"09","0","1",null, null, null);
+        }
+
 
         // 审批增加分组
         Map<String, Object> flowableRes = flowableService.addFlowableGroup(scyId, company.getScyName());
@@ -916,7 +931,7 @@ public class OwnAuthController extends BaseController {
             //判断当日是否有开户申请
             if ((bankAcc.get(0).getPbaiCfcaDate()).compareTo(zero)>0){
                 //判断申请次数
-                if(Integer.valueOf(company.getScyCfcaAuthNumber())>=2){
+                if(Integer.valueOf(company.getScyCfcaBankTime())>=2){
                     throw new Exception("今日开户已达上限");
                 }
             }
@@ -955,10 +970,10 @@ public class OwnAuthController extends BaseController {
         //打款认证
         sysCompany.setScyStatus("05");
         //对公户打款次数
-        if("1".equals(company.getScyCfcaAuthNumber())){
-            sysCompany.setScyCfcaAuthNumber("2");
+        if("1".equals(company.getScyCfcaBankTime())){
+            sysCompany.setScyCfcaBankTime("2");
         }else{
-            sysCompany.setScyCfcaAuthNumber("1");
+            sysCompany.setScyCfcaBankTime("1");
         }
         sysCompanyService.updateSysCompany(sysCompany);
         // 刷新登录用户菜单和权限