From 28e148e28986a08414a4c690a5e5e7ecdc87f9a7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:56:06 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 199 +++++++++++++++++++++++++++++--------------------
1 files changed, 117 insertions(+), 82 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..81a1d5a 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,20 +327,31 @@
return super.packForBT(page);
}
+
/**
* 新增分公司管理
*/
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
//判断账号是否已存在
int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
if (count > 0) {
return "error";
}
+ if(ToolUtil.isEmpty(tCompany.getIdentifier())){
+ return "统一社会信用代码不能为空";
+ }
//调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
- String enterCode = "";
+// CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
+ String enterCode = "";
Integer enterNew = null;
Long empId = null;
Integer empnew = null;
@@ -351,6 +362,7 @@
CreateEnterpriseRequest request = new CreateEnterpriseRequest();
request.setName(tCompany.getName());
request.setNickName(tCompany.getName());
+ request.setUscc(tCompany.getIdentifier());
request.setIndustry_code("123456");
request.setMobile(account);
CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
@@ -373,7 +385,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 +426,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 +463,7 @@
addSocpe(subArr, tCompany.getId());
return SUCCESS_TIP;
}
+
//添加经营区域
public void addSocpe(String subArr,Integer id){
JSONArray jsonArray = JSON.parseArray(subArr);
@@ -486,18 +500,114 @@
}
/**
+ * 删除分公司管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tCompanyId) {
+ TCompany tCompany = tCompanyService.selectById(tCompanyId);
+ //调用中台接口创建企业
+ if(1 == tCompany.getEnterNew()){
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
+ if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
+ ShiroUser user1 = shiroExtUtil.getUser();
+ User user = userService.selectById(user1.getId());
+ ResultUtil resultUtil = EnterpriseUtil.delEnterprise(checkEnterExist.getEnterCode(), user.getPhone());
+ if(resultUtil.getStatus() != 200){
+ return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
+ }
+ }
+ }
+
+ tCompany.setFlag("3");
+ tCompanyService.updateById(tCompany);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改分公司管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
+ User user = userService.selectById(userId);
+ if(null != user && ToolUtil.isNotEmpty(password)){
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ userService.updateById(user);
+ }
+ tCompany.setUpdateTime(new Date());
+ tCompanyService.updateById(tCompany);
+ //添加经营区域
+ addSocpe(subArr, tCompany.getId());
+
+ TCompany tCompany1 = tCompanyService.selectById(tCompany.getId());
+ if (tCompany1.getType() == 1) {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if (pushMinistryOfTransport) {//上传平台数据
+ pushMinistryOfTransportUtil.baseInfoCompanyPay();//上传网约车平台公司支付信息
+ pushMinistryOfTransportUtil.baseInfoCompany(tCompany.getId());
+ pushMinistryOfTransportUtil.baseInfoCompanyService();
+ pushMinistryOfTransportUtil.baseInfoCompanyPermit(tCompany.getId());
+ }
+ }
+ }).start();
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改加盟商管理
+ */
+ @RequestMapping(value = "/updateFranchisee")
+ @ResponseBody
+ public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
+ tCompany.setUpdateTime(new Date());
+ tCompany.setVersion(tCompany.getVersion() + 1);
+ tCompanyService.updateById(tCompany);
+
+ //修改账号密码
+ User user = userService.selectById(userId);
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ userService.updateById(user);
+ return SUCCESS_TIP;
+ }
+
+ /**
* 新增加盟商管理
*/
@RequestMapping(value = "/addFranchisee")
@ResponseBody
public Object addFranchisee(TCompany tCompany,String account,String password) {
+ String name = tCompany.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tCompany.setName(name);
//判断账号是否已存在
int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
if (count > 0) {
return "error";
}
+ if(ToolUtil.isEmpty(tCompany.getIdentifier())){
+ return "统一社会信用代码不能为空";
+ }
//调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
String enterCode = "";
Long empId = null;
Integer empnew = null;
@@ -510,6 +620,7 @@
CreateEnterpriseRequest request = new CreateEnterpriseRequest();
request.setName(tCompany.getName());
request.setNickName(tCompany.getName());
+ request.setUscc(tCompany.getIdentifier());
request.setIndustry_code("123456");
request.setMobile(account);
CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
@@ -531,7 +642,7 @@
enterNew = 0;
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() + "管理员");
@@ -570,6 +681,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("3");
@@ -603,82 +715,5 @@
}
return SUCCESS_TIP;
}
-
- /**
- * 删除分公司管理
- */
- @RequestMapping(value = "/delete")
- @ResponseBody
- public Object delete(@RequestParam Integer tCompanyId) {
- TCompany tCompany = tCompanyService.selectById(tCompanyId);
- //调用中台接口创建企业
- if(1 == tCompany.getEnterNew()){
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
- if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
- ShiroUser user1 = shiroExtUtil.getUser();
- User user = userService.selectById(user1.getId());
- ResultUtil resultUtil = EnterpriseUtil.delEnterprise(checkEnterExist.getEnterCode(), user.getPhone());
- if(resultUtil.getStatus() != 200){
- return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
- }
- }
- }
-
- tCompany.setFlag("3");
- tCompanyService.updateById(tCompany);
- return SUCCESS_TIP;
- }
-
- /**
- * 修改分公司管理
- */
- @RequestMapping(value = "/update")
- @ResponseBody
- public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
- User user = userService.selectById(userId);
- if(null != user && ToolUtil.isNotEmpty(password)){
- user.setPassword(ShiroKit.md5(password, user.getSalt()));
- userService.updateById(user);
- }
- tCompany.setUpdateTime(new Date());
- tCompanyService.updateById(tCompany);
- //添加经营区域
- addSocpe(subArr, tCompany.getId());
-
- TCompany tCompany1 = tCompanyService.selectById(tCompany.getId());
- if (tCompany1.getType() == 1) {
- new Thread(new Runnable() {
- @Override
- public void run() {
- if (pushMinistryOfTransport) {//上传平台数据
- pushMinistryOfTransportUtil.baseInfoCompanyPay();//上传网约车平台公司支付信息
- pushMinistryOfTransportUtil.baseInfoCompany(tCompany.getId());
- pushMinistryOfTransportUtil.baseInfoCompanyService();
- pushMinistryOfTransportUtil.baseInfoCompanyPermit(tCompany.getId());
- }
- }
- }).start();
- }
- return SUCCESS_TIP;
- }
-
- /**
- * 修改加盟商管理
- */
- @RequestMapping(value = "/updateFranchisee")
- @ResponseBody
- public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId) {
- tCompany.setUpdateTime(new Date());
- tCompany.setVersion(tCompany.getVersion() + 1);
- tCompanyService.updateById(tCompany);
-
- //修改账号密码
- User user = userService.selectById(userId);
- user.setPassword(ShiroKit.md5(password, user.getSalt()));
- userService.updateById(user);
- return SUCCESS_TIP;
- }
-
-
}
--
Gitblit v1.7.1