From 9d8dba1ff84484e6e3182635af537f13c809abd1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 10:43:15 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index d564c72..dd8c7e6 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -45,6 +45,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static javax.swing.UIManager.get;
+
/**
* <p>
* 前端控制器
@@ -179,10 +181,17 @@
userShop.setUserId(userId);
userShop.setShopId(shopId);
userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShop.setNickName(user.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopClient.saveUserShop(userShop);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shopId);
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopClient.saveUserShop(userShop);
+ }
}
// 更换下级会员绑定门店
@@ -214,7 +223,6 @@
}
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
-
shopService.updateById(shop);
// 查询有没有门店绑定这个被删除的门店
List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
@@ -223,16 +231,19 @@
.eq(Shop::getId,shop1.getId());
shopService.update(set);
}
+ //清除用户绑定当前门店
appUserClient.clearBindShop(shop.getId());
+ //查询门店绑定的平台账号
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(data.size() > 0){
+ //删除门店后台账号和关系数据
+ sysUserClient.delShopUser(shop.getId(), 2);
+
+ //修改小程序用户类型和门店数据
List<Integer> collect = data.stream().map(UserShop::getUserId).collect(Collectors.toList()).stream().map(Long::intValue).collect(Collectors.toList());
List<SysUser> sysUserList = sysUserClient.getUserList(collect).getData();
- //删除门店下的所有员工
- sysUserClient.delShopUser(shop.getId(), 2);
- //修改小程序用户类型和门店数据
for (SysUser sysUser : sysUserList) {
//通过电话号码查询小程序用户和门店关系数据
AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).getData();
@@ -242,10 +253,10 @@
appUser.setUserType(1);
appUserClient.editAppUserById(appUser);
}
- //删除用户门店关系表数据
+ //删除用户门店关系数据
AppUserShop appUserShop = new AppUserShop();
- appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setAppUserId(appUser.getId());
appUserShopClient.delAppUserShop(appUserShop);
}
}
@@ -256,6 +267,14 @@
technician.setDelFlag(1);
}
technicianService.updateBatchById(list);
+ //删除技师和门店关系数据
+ //删除用户门店关系数据
+ AppUserShop appUserShop = new AppUserShop();
+ appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(3);
+ appUserShopClient.delAppUserShop(appUserShop);
+
+ //取消门店预约技师数据
Set<Integer> collect = list.stream().map(Technician::getId).collect(Collectors.toSet());
technicianSubscribeService.update(new LambdaUpdateWrapper<TechnicianSubscribe>().in(TechnicianSubscribe::getTechnicianId, collect).eq(TechnicianSubscribe::getDelFlag, 0)
.eq(TechnicianSubscribe::getStatus, 0).set(TechnicianSubscribe::getStatus, 2));
@@ -289,15 +308,33 @@
AppUser appUser = appUserClient.getAppUserById(old_shop.getAppUserId());
//需要先判断用户是否没有关联任何门店
List<AppUserShop> userShops = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ //当前小程序账号如果关联的店铺是最后一个，则将其修改为普通用户
if(userShops.size() == 1 && userShops.get(0).getShopId().equals(shop.getId())){
appUser.setUserType(1);
appUserClient.editAppUserById(appUser);
}
+ //删除原店长关系数据
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
appUserShop.setRoleType(1);
appUserShopClient.delAppUserShop(appUserShop);
+ //删除后台用户和店铺关系数据
+ UserShop userShop = new UserShop();
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ if(null != data && data.size() > 0){
+ UserShop userShop1 = data.get(0);
+ userShopClient.delUserShop(userShop1);
+ //如果当前后台账户关联的店铺是最后一个，删除后台账户
+ userShop = new UserShop();
+ userShop.setUserId(userShop1.getUserId());
+ data = userShopClient.getUserShop(userShop).getData();
+ if(data.size() == 0){
+ sysUserClient.delSysUserById(userShop1.getUserId());
+ }
+ }
//添加新管理员
appUser = appUserClient.getAppUserByPhone1(phone).getData();
@@ -309,25 +346,25 @@
appUser.setUserType(2);
appUserClient.editAppUserById(appUser);
-
//修改管理员
shop.setAppUserId(appUser.getId());
shopService.updateById(shop);
-
+
//添加门店后台账号和门店关系数据
SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
if(null != sysUser){
- UserShop userShop = new UserShop();
- userShop.setUserId(sysUser.getUserId());
+ userShop = new UserShop();
userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- List<UserShop> data = userShopClient.getUserShop(userShop).getData();
+ userShop.setUserId(sysUser.getUserId());
+ data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(sysUser.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
}else{
@@ -346,13 +383,21 @@
user.setPassword(phone.substring(5));
user.setCreateTime(new Date());
Long userId = sysUserClient.saveShopUser(user).getData();
-
- UserShop userShop = new UserShop();
- userShop.setUserId(userId);
+
+ userShop = new UserShop();
userShop.setShopId(shop.getId());
- userShop.setRoleType(1);
- userShop.setRoleId(2L);
- userShopClient.saveUserShop(userShop);
+ userShop.setUserId(userId);
+ data = userShopClient.getUserShop(userShop).getData();
+ if(null == data || data.size() == 0){
+ userShop = new UserShop();
+ userShop.setUserId(userId);
+ userShop.setShopId(shop.getId());
+ userShop.setRoleType(1);
+ userShop.setRoleId(2L);
+ userShop.setNickName(appUser.getName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopClient.saveUserShop(userShop);
+ }
}
return R.ok();
}
--
Gitblit v1.7.1