From ec73339e08669dc5a0d4ff93e6640f51473c08cd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:03:50 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 cef7042..900ea22 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
@@ -132,6 +132,7 @@
userShop.setUserId(sysUser.getUserId());
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
+ userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
@@ -139,6 +140,7 @@
userShop.setShopId(shop.getId());
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
}else{
@@ -182,6 +184,18 @@
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
+ // 查询有没有门店绑定了该门店为上级门店
+ List<Shop> shops = shopService.lambdaQuery()
+ .eq(Shop::getPid, id).list();
+ if(!shops.isEmpty()){
+ for (Shop shop1 : shops) {
+ shop1.setPid(0);
+ }
+ }
+ AppUser appUserById = appUserClient.getAppUserById(shop.getAppUserId());
+ appUserById.setUserType(1);
+ appUserClient.editAppUserById(appUserById);
+ shopService.updateBatchById(shops);
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
@@ -228,6 +242,12 @@
if (!shopService.cheUserByPhone(phone)) {
return R.fail("该手机号未注册");
}
+ if (shop.getPid()!=null){
+ Shop shopP = shopService.getById(shop.getPid());
+ if (shopP.getPid()!=null&&shopP.getPid()!=0&& shopP.getPid().equals(shop.getId())){
+ return R.fail("门店之间不能互相作为上级门店");
+ }
+ }
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
shop.setProvinceCode(city.substring(0, 2) + "0000");
shop.setCityCode(city.substring(0, 4) + "00");
--
Gitblit v1.7.1