From ddf3f19408fb311734218aaaa5edb49c5134b1eb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 21:14:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 4a5dc06..ee35476 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
@@ -182,7 +182,6 @@
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
- //获取门店的员工数据
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
@@ -192,16 +191,19 @@
sysUserClient.delShopUser(shop.getId(), 2);
//修改小程序用户类型和门店数据
for (SysUser sysUser : sysUserList) {
- String userName = sysUser.getUserName();
//通过电话号码查询小程序用户和门店关系数据
- AppUser appUser = appUserClient.getAppUserByPhone1(userName).getData();
+ AppUser appUser = appUserClient.getAppUserByPhone1(sysUser.getUserName()).getData();
//需要先判断用户是否没有关联任何门店
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());
+ appUserShopClient.delAppUserShop(appUserShop);
}
return R.ok();
}
@@ -402,6 +404,9 @@
@ApiOperation(value = "绑定门店", tags = {"小程序-个人中心"})
public R<Void> bindShop(@ApiParam("门店id") @RequestParam Integer shopId) {
AppUser appUser = appUserClient.getAppUserById(SecurityUtils.getUserId());
+ if(null != appUser.getShopId()){
+ return R.fail("不能重复绑定门店");
+ }
appUser.setShopId(shopId);
return appUserClient.editAppUserById(appUser);
}
--
Gitblit v1.7.1