From e0201ae86d66acd7127a9c01080731ee22e4b974 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 08 九月 2025 16:41:24 +0800
Subject: [PATCH] 新增加跨城支付
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 bd30e67..c25bc65 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
@@ -334,6 +334,12 @@
@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) {
@@ -343,21 +349,18 @@
return "统一社会信用代码不能为空";
}
//调用中台接口创建企业
-// CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
String enterCode = "";
Integer enterNew = null;
Long empId = null;
Integer empnew = 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.setUscc(tCompany.getIdentifier());
- request.setIndustry_code("123456");
+ request.setIndustry_code("292");
request.setMobile(account);
CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
enterCode = enterprise.getIdCode();
@@ -524,6 +527,12 @@
@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()));
@@ -557,6 +566,12 @@
@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);
@@ -574,6 +589,12 @@
@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) {
@@ -597,7 +618,7 @@
request.setName(tCompany.getName());
request.setNickName(tCompany.getName());
request.setUscc(tCompany.getIdentifier());
- request.setIndustry_code("123456");
+ request.setIndustry_code("292");
request.setMobile(account);
CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
enterCode = enterprise.getIdCode();
@@ -613,8 +634,8 @@
}
//企业已注册
if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
+ enterCode = checkEnterExist.getEnterCode();
List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
- enterCode = checkEnterExist.getEnterCode();
enterNew = 0;
if(null == userInfoByPhone || userInfoByPhone.size() == 0){
SaveStaffNodeRequest request = new SaveStaffNodeRequest();
--
Gitblit v1.7.1