From 4e8cadb13ebd6f01b8cf6d5cc89757cf8e960792 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期三, 30 九月 2026 12:22:24 +0800
Subject: [PATCH] 门店管理修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index a5d0e85..575aab3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -96,7 +96,7 @@
@ResponseBody
public List<TStore> getStores(Integer id)
{
- payMoneyUtil.getMessage();
+// payMoneyUtil.getMessage();
return storeService.list(new QueryWrapper<TStore>()
.eq("operatorId",id)
.ne("state",3));
@@ -128,10 +128,10 @@
}
@RequestMapping("/bindWx/{id}")
public String bindWx(Model model,@PathVariable("id") Integer id) {
-
+ TOperator operator = operatorService.getById(id);
model.addAttribute("id",id);
- model.addAttribute("merchantNumber",operatorService.getById(id).getMerchantNumber());
- model.addAttribute("name",operatorService.getById(id).getMerchantName());
+ model.addAttribute("merchantNumber",operator.getMerchantNumber());
+ model.addAttribute("merchantNumberAli",operator.getMerchantNumberAli());
return PREFIX + "Operator_wx.html";
}
/**
@@ -145,9 +145,14 @@
TOperator byId = operatorService.getById(id);
// 运营商名称
model.addAttribute(byId.getName());
- User byId1 = userService.getById(byId.getUserId());
- model.addAttribute("userName",byId1.getName());
- model.addAttribute("phone",byId1.getPhone());
+ // 历史数据可能存在 t_operator.userId 未同步的情况，不能因此让编辑页手机号丢失。
+ User byId1 = byId.getUserId() == null ? null : userService.getById(byId.getUserId());
+ if (byId1 == null) {
+ byId1 = userService.getOne(new QueryWrapper<User>()
+ .eq("objectId", id).eq("objectType", 2));
+ }
+ model.addAttribute("userName", byId1 == null ? "" : byId1.getName());
+ model.addAttribute("phone", byId1 == null ? "" : byId1.getPhone());
model.addAttribute("data",byId);
// 获取全部的省
List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", id).eq("pid",0));
@@ -192,15 +197,11 @@
*/
@RequestMapping(value = "/merchantNumberWx")
@ResponseBody
- public Object listAll(Integer id, String merchantNumber,String name) throws Exception {
+ public Object listAll(Integer id, String merchantNumber,String merchantNumberAli) throws Exception {
TOperator byId = operatorService.getById(id);
byId.setMerchantNumber(merchantNumber);
- byId.setMerchantName(name);
+ byId.setMerchantNumberAli(merchantNumberAli);
operatorService.updateById(byId);
- ResultUtil resultUtil = payMoneyUtil.addReceiver(merchantNumber, name);
- if (resultUtil.getCode() == 500){
- return ResultUtil.error(resultUtil.getMsg());
- }
return SUCCESS_TIP;
}
@@ -1348,9 +1349,9 @@
@ResponseBody
@RequestMapping(value = "/addOperator")
public ResultUtil addOperator(String name,String userName,String phone,Integer type , String comArr) {
- User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
- if (one!=null){
- return ResultUtil.error("当前管理员名称和电话已存在!");
+ List<User> list = userService.lambdaQuery().eq(User::getPhone, phone).list();
+ if (!list.isEmpty()){
+ return ResultUtil.error("当前管理员手机号已存在!");
}
User user = new User();
user.setName(userName);
@@ -1438,13 +1439,17 @@
@RequestMapping(value = "/updateOperator")
public ResultUtil updateOperator(Integer id,String name,String userName
,String phone,Integer type ,@RequestParam String comArr) {
- User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
- if (one!=null){
- return ResultUtil.error("当前管理员名称和电话已存在!");
+ // id 是运营商 ID，不是 sys_user.id；按运营商 ID 排除会把当前管理员误判为手机号重复。
+ User user = userService.getOne(new QueryWrapper<User>().eq("objectId", id)
+ .eq("objectType", 2));
+ if (user == null) {
+ return ResultUtil.error("运营商关联管理员不存在");
+ }
+ List<User> list = userService.lambdaQuery().eq(User::getPhone, phone).ne(User::getId, user.getId()).list();
+ if (!list.isEmpty()){
+ return ResultUtil.error("当前管理员手机号已存在!");
}
operatorCityService.remove(new QueryWrapper<TOperatorCity>().eq("operatorId",id));
- User user = userService.getOne(new QueryWrapper<User>().eq("objectId", id).
- eq("objectType", 2));
user.setName(userName);
user.setAccount(phone);
user.setPhone(phone);
--
Gitblit v1.7.1