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/TShopController.java | 93 ++++++----------------------------------------
1 files changed, 12 insertions(+), 81 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 3eeddb7..521328d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -333,11 +333,8 @@
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("time",byId.getStartTime()+" - "+byId.getEndTime());
- User byId1 = userMapper.selectById(byId.getStoreStaffId());
- model.addAttribute("city",byId1);
- model.addAttribute("managerName", byId1 == null ? "" : byId1.getName());
- // 历史门店的手机号可能只保存在店长账号中，编辑页需与列表保持一致地回填可用手机号。
- model.addAttribute("managerPhone", resolveStoreManagerPhone(byId, byId1));
+ model.addAttribute("managerName", byId.getManagerName());
+ model.addAttribute("managerPhone", byId.getPhone());
model.addAttribute("type",1);
// 如果当前登陆人是运营商
if (UserExt.getUser().getObjectType()==2){
@@ -417,10 +414,8 @@
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("time",byId.getStartTime()+" - "+byId.getEndTime());
- User byId1 = userMapper.selectById(byId.getStoreStaffId());
- model.addAttribute("city",byId1);
- model.addAttribute("managerName", byId1 == null ? "" : byId1.getName());
- model.addAttribute("managerPhone", resolveStoreManagerPhone(byId, byId1));
+ model.addAttribute("managerName", byId.getManagerName());
+ model.addAttribute("managerPhone", byId.getPhone());
model.addAttribute("type",0);
return PREFIX + "TShop_edit.html";
@@ -491,23 +486,8 @@
// 不能用 roleid（菜单权限）判断，避免员工被授予角色 1 后被误当成运营商。
list = storeService.listAll(page, provinceCode, cityCode, name, phone, shopName, null);
}
- normalizePhoneFields(list);
page.setRecords(list);
return super.packForBT(page);
- }
-
- /**
- * 统一将列表 DTO 的底层字段写回非 null 值。
- *
- * 部分运行环境使用字段序列化而非 JavaBean getter 序列化；仅在 getter 中做兜底时，
- * 此类环境仍可能把原始 null 输出为 JSON null。这里在返回前固化字段值，保证三个
- * 数据范围的列表接口均稳定返回 phone、userPhone 两个字符串字段。
- */
- private void normalizePhoneFields(List<TStoreListVo> stores) {
- for (TStoreListVo store : stores) {
- store.setPhone(store.getPhone());
- store.setUserPhone(store.getUserPhone());
- }
}
@RequestMapping(value = "/listOne")
@@ -543,9 +523,7 @@
if (ToolUtil.isEmpty(userName) || ToolUtil.isEmpty(tStore.getPhone())) {
return ERROR;
}
- if (!userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, tStore.getPhone())).isEmpty()) {
- return "5001";
- }
+ tStore.setManagerName(userName);
if(yyId==null || type==1){
yyId=0;
}
@@ -638,9 +616,6 @@
String space_id = data.getString("space_id");
Integer integer = Integer.valueOf(space_id);
tStore.setId(integer);
- User storeManager = createStoreManager(userName, tStore.getPhone(), tStore.getId());
- userMapper.insert(storeManager);
- tStore.setStoreStaffId(storeManager.getId());
storeService.save(tStore);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
@@ -685,14 +660,7 @@
if (ToolUtil.isEmpty(userName) || ToolUtil.isEmpty(tStore.getPhone())) {
return ERROR;
}
- LambdaQueryWrapper<User> managerAccountQuery = new LambdaQueryWrapper<User>()
- .eq(User::getAccount, tStore.getPhone());
- if (byIdc.getStoreStaffId() != null) {
- managerAccountQuery.ne(User::getId, byIdc.getStoreStaffId());
- }
- if (!userMapper.selectList(managerAccountQuery).isEmpty()) {
- return "5001";
- }
+ tStore.setManagerName(userName);
if(yyId==null){
yyId=0;
@@ -762,17 +730,6 @@
if (UserExt.getUser().getObjectType()==2){
tStore.setOperatorId(null);
}
- User storeManager = byIdc.getStoreStaffId() == null ? null : userMapper.selectById(byIdc.getStoreStaffId());
- if (storeManager == null) {
- storeManager = createStoreManager(userName, tStore.getPhone(), tStore.getId());
- userMapper.insert(storeManager);
- tStore.setStoreStaffId(storeManager.getId());
- } else {
- storeManager.setName(userName);
- storeManager.setPhone(tStore.getPhone());
- storeManager.setAccount(tStore.getPhone());
- userMapper.updateById(storeManager);
- }
storeService.updateById(tStore);
return new SuccessTip<>();
@@ -782,26 +739,6 @@
}
}
- private User createStoreManager(String name, String phone, Integer storeId) {
- User user = new User();
- user.setName(name);
- user.setPhone(phone);
- user.setAccount(phone);
- user.setPassword(SecureUtil.md5("a123456"));
- user.setRoleid("3");
- user.setObjectType(3);
- user.setObjectId(storeId);
- user.setStatus(1);
- user.setCreatetime(new Date());
- return user;
- }
-
- private String resolveStoreManagerPhone(TStore store, User storeManager) {
- if (ToolUtil.isNotEmpty(store.getPhone())) {
- return store.getPhone();
- }
- return storeManager == null ? "" : storeManager.getPhone();
- }
@RequestMapping(value = "/onChange")
@ResponseBody
public Object onChange(Integer oneId) {
@@ -1039,15 +976,9 @@
@ResponseBody
public Object freeze(Integer id) {
try {
- // 查询门店 获取门店店长id
TStore store = storeService.getById(id);
- // 冻结
store.setState(2);
storeService.updateById(store);
- Integer storeStaffId = store.getStoreStaffId();
- User user = userService.getById(storeStaffId);
- user.setStatus(2);
- userService.updateById(user);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -1058,15 +989,9 @@
@ResponseBody
public Object unfreeze(Integer id) {
try {
- // 查询门店 获取门店店长id
TStore store = storeService.getById(id);
- // 解冻
store.setState(1);
storeService.updateById(store);
- Integer storeStaffId = store.getStoreStaffId();
- User user = userService.getById(storeStaffId);
- user.setStatus(1);
- userService.updateById(user);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -1093,7 +1018,13 @@
public Object pwd(Integer id) {
try {
TStore byId = storeService.getById(id);
+ if (byId == null || byId.getStoreStaffId() == null) {
+ return ERROR;
+ }
User user = userMapper.selectById(byId.getStoreStaffId());
+ if (user == null) {
+ return ERROR;
+ }
user.setPassword(SecureUtil.md5("a123456"));
userMapper.updateById(user);
return SUCCESS_TIP;
--
Gitblit v1.7.1