From 4918c9ad2c5807dd5b5dc3b2cc0a9a74031d4278 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 七月 2025 10:20:37 +0800
Subject: [PATCH] 修改三方对接逻辑和环境参数配置
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 246 ++++++++++++++++++++++++------------------------
1 files changed, 124 insertions(+), 122 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 49a83a2..876fd9b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -327,6 +327,7 @@
return super.packForBT(page);
}
+
/**
* 新增分公司管理
*/
@@ -373,7 +374,7 @@
if(null == userInfoByPhone ||userInfoByPhone.size() == 0){
//负责人不匹配，则创建新的员工到中台
SaveStaffNodeRequest request = new SaveStaffNodeRequest();
- request.setMobile(user2.getPhone());
+ request.setMobile(checkEnterExist.getMobile());
request.setEntercode(enterCode);
request.setEmpName(tCompany.getName() + "管理员");
request.setEmpNickname(tCompany.getName() + "管理员");
@@ -414,6 +415,7 @@
//添加User对象
User user = new User();
user.setAccount(account);
+ user.setPhone(account);
user.setSalt(ShiroKit.getRandomSalt(5));
user.setPassword(ShiroKit.md5(password, user.getSalt()));
user.setRoleid("2");
@@ -450,6 +452,7 @@
addSocpe(subArr, tCompany.getId());
return SUCCESS_TIP;
}
+
//添加经营区域
public void addSocpe(String subArr,Integer id){
JSONArray jsonArray = JSON.parseArray(subArr);
@@ -483,125 +486,6 @@
tCompanyCityService.updateById(tCompanyCity);
}
}
- }
-
- /**
- * 新增加盟商管理
- */
- @RequestMapping(value = "/addFranchisee")
- @ResponseBody
- public Object addFranchisee(TCompany tCompany,String account,String password) {
- //判断账号是否已存在
- int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
- if (count > 0) {
- return "error";
- }
- //调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
- String enterCode = "";
- Long empId = null;
- Integer empnew = null;
- Integer enterNew = null;
- ShiroUser user1 = shiroExtUtil.getUser();
- User user2 = userService.selectById(user1.getId());
-
- //企业未注册，进行注册
- if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
- CreateEnterpriseRequest request = new CreateEnterpriseRequest();
- request.setName(tCompany.getName());
- request.setNickName(tCompany.getName());
- request.setIndustry_code("123456");
- request.setMobile(account);
- CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
- enterCode = enterprise.getIdCode();
- enterNew = 1;
- List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
- if(null != userInfoByPhone && userInfoByPhone.size() > 0){
- empId = userInfoByPhone.get(0).getEmpId();
- empnew = 0;
- }else{
- empId = 0L;
- empnew = 1;
- }
- }
- //企业已注册
- if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
- List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
- enterCode = checkEnterExist.getEnterCode();
- enterNew = 0;
- if(null == userInfoByPhone || userInfoByPhone.size() == 0){
- SaveStaffNodeRequest request = new SaveStaffNodeRequest();
- request.setMobile(user2.getPhone());
- request.setEntercode(enterCode);
- request.setEmpName(tCompany.getName() + "管理员");
- request.setEmpNickname(tCompany.getName() + "管理员");
- request.setLoginNo(account);
- request.setEmpSex("女");
- request.setMphone(account);
- request.setEmail(account + "@qyt.com");
- request.setDeptId(0);
- request.setPositionId(1);
- request.setSuperLevel(0);
- request.setHideMobile(0);
- ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
- if(200 != resultUtil.getStatus()){
- return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
- }
- SaveStaffNode saveStaffNode = resultUtil.getData();
- empId = saveStaffNode.getEmpId();
- empnew = 1;
- }else{
- empId = userInfoByPhone.get(0).getEmpId();
- empnew = 0;
- }
- }
-
- tCompany.setEnterCode(enterCode);
- tCompany.setEnterNew(enterNew);
- tCompany.setType(3); //2：分公司
- if (shiroExtUtil.getUser().getRoleType() == 2) {
- tCompany.setSuperiorId(shiroExtUtil.getUser().getObjectId());
- }
- tCompany.setState(0); //0：正常
- tCompany.setFlag("1");
- tCompany.setInsertTime(new Date());
- tCompanyService.insert(tCompany);
-
- //添加User对象
- User user = new User();
- user.setAccount(account);
- user.setSalt(ShiroKit.getRandomSalt(5));
- user.setPassword(ShiroKit.md5(password, user.getSalt()));
- user.setRoleid("3");
- user.setDeptid(26);
- user.setStatus(1);
- user.setCreatetime(new Date());
- user.setRoleType(3);
- user.setObjectId(tCompany.getId());
- user.setName(tCompany.getName());
- user.setSex(1);
- user.setEmpId(empId);
- user.setEntercode(enterCode);
- user.setEnterId(Long.valueOf(enterCode));
- user.setEmpnew(empnew);
- userService.insert(user);
- //编写异步延迟处理中台账号延迟创建的问题
- if(0 == empId){
- Timer timer = new Timer();
- String finalEnterCode = enterCode;
- timer.schedule(new TimerTask() {
- @Override
- public void run() {
- List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, finalEnterCode);
- if(null != userInfoByPhone && userInfoByPhone.size() > 0){
- Long empId1 = userInfoByPhone.get(0).getEmpId();
- user.setEmpId(empId1);
- userService.updateById(user);
- }
- }
- },120*1000);
- }
- return SUCCESS_TIP;
}
/**
@@ -678,7 +562,125 @@
userService.updateById(user);
return SUCCESS_TIP;
}
-
-
+
+ /**
+ * 新增加盟商管理
+ */
+ @RequestMapping(value = "/addFranchisee")
+ @ResponseBody
+ public Object addFranchisee(TCompany tCompany,String account,String password) {
+ //判断账号是否已存在
+ int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
+ if (count > 0) {
+ return "error";
+ }
+ //调用中台接口创建企业
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ String enterCode = "";
+ Long empId = null;
+ Integer empnew = null;
+ Integer enterNew = null;
+ ShiroUser user1 = shiroExtUtil.getUser();
+ User user2 = userService.selectById(user1.getId());
+
+ //企业未注册，进行注册
+ if (null == checkEnterExist || "0".equals(checkEnterExist.getIsReg())) {
+ CreateEnterpriseRequest request = new CreateEnterpriseRequest();
+ request.setName(tCompany.getName());
+ request.setNickName(tCompany.getName());
+ request.setIndustry_code("123456");
+ request.setMobile(account);
+ CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
+ enterCode = enterprise.getIdCode();
+ enterNew = 1;
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
+ if(null != userInfoByPhone && userInfoByPhone.size() > 0){
+ empId = userInfoByPhone.get(0).getEmpId();
+ empnew = 0;
+ }else{
+ empId = 0L;
+ empnew = 1;
+ }
+ }
+ //企业已注册
+ if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
+ enterCode = checkEnterExist.getEnterCode();
+ enterNew = 0;
+ if(null == userInfoByPhone || userInfoByPhone.size() == 0){
+ SaveStaffNodeRequest request = new SaveStaffNodeRequest();
+ request.setMobile(checkEnterExist.getMobile());
+ request.setEntercode(enterCode);
+ request.setEmpName(tCompany.getName() + "管理员");
+ request.setEmpNickname(tCompany.getName() + "管理员");
+ request.setLoginNo(account);
+ request.setEmpSex("女");
+ request.setMphone(account);
+ request.setEmail(account + "@qyt.com");
+ request.setDeptId(0);
+ request.setPositionId(1);
+ request.setSuperLevel(0);
+ request.setHideMobile(0);
+ ResultUtil<SaveStaffNode> resultUtil = EmployeeUtil.saveStaffNode(request);
+ if(200 != resultUtil.getStatus()){
+ return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
+ }
+ SaveStaffNode saveStaffNode = resultUtil.getData();
+ empId = saveStaffNode.getEmpId();
+ empnew = 1;
+ }else{
+ empId = userInfoByPhone.get(0).getEmpId();
+ empnew = 0;
+ }
+ }
+
+ tCompany.setEnterCode(enterCode);
+ tCompany.setEnterNew(enterNew);
+ tCompany.setType(3); //2：分公司
+ if (shiroExtUtil.getUser().getRoleType() == 2) {
+ tCompany.setSuperiorId(shiroExtUtil.getUser().getObjectId());
+ }
+ tCompany.setState(0); //0：正常
+ tCompany.setFlag("1");
+ tCompany.setInsertTime(new Date());
+ tCompanyService.insert(tCompany);
+
+ //添加User对象
+ User user = new User();
+ user.setAccount(account);
+ user.setPhone(account);
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ user.setRoleid("3");
+ user.setDeptid(26);
+ user.setStatus(1);
+ user.setCreatetime(new Date());
+ user.setRoleType(3);
+ user.setObjectId(tCompany.getId());
+ user.setName(tCompany.getName());
+ user.setSex(1);
+ user.setEmpId(empId);
+ user.setEntercode(enterCode);
+ user.setEnterId(Long.valueOf(enterCode));
+ user.setEmpnew(empnew);
+ userService.insert(user);
+ //编写异步延迟处理中台账号延迟创建的问题
+ if(0 == empId){
+ Timer timer = new Timer();
+ String finalEnterCode = enterCode;
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, finalEnterCode);
+ if(null != userInfoByPhone && userInfoByPhone.size() > 0){
+ Long empId1 = userInfoByPhone.get(0).getEmpId();
+ user.setEmpId(empId1);
+ userService.updateById(user);
+ }
+ }
+ },120*1000);
+ }
+ return SUCCESS_TIP;
+ }
}
--
Gitblit v1.7.1