From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 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 43ceb6d..64e4910 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
@@ -94,10 +94,10 @@
@Transactional(rollbackFor = Exception.class)
public R<Void> add(@RequestBody Shop shop){
String phone = shop.getPhone();
- if (!shopService.cheUserByPhone(phone)) {
+ AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
+ if (appUser == null){
return R.fail("该手机号未注册");
}
- AppUser appUser = appUserClient.getAppUserByPhone1(phone).getData();
shop.setShopAllPoint(0);
shop.setLowerLevelSharePoint(0);
shop.setSharePoint(0);
@@ -119,9 +119,11 @@
shop.setDistrictCode(city);
shopService.save(shop);
+ Integer shopId = shop.getId();
+
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
- appUserShop.setShopId(shop.getId());
+ appUserShop.setShopId(shopId);
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
throw new RuntimeException("添加失败");
@@ -136,15 +138,17 @@
if(null != sysUser){
UserShop userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
+ userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
userShop.setUserId(sysUser.getUserId());
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
}else{
@@ -158,7 +162,7 @@
user.setStatus("0");
user.setDelFlag("0");
user.setRoleType(2);
- user.setObjectId(shop.getId());
+ user.setObjectId(shopId);
user.setAppUserId(appUser.getId());
user.setPassword(phone.substring(5));
user.setCreateTime(new Date());
@@ -166,10 +170,16 @@
UserShop userShop = new UserShop();
userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
userShopClient.saveUserShop(userShop);
+ }
+
+ // 更换下级会员绑定门店
+ R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
+ if (R.isError(lowerShopR)){
+ throw new RuntimeException("更换下级会员绑定门店失败");
}
return R.ok();
}
@@ -185,6 +195,14 @@
@DeleteMapping("/deleteShop")
@ApiOperation(value = "删除门店", tags = {"管理后台-门店管理"})
public R<Void> deleteShop(@ApiParam("门店id") @RequestParam("id") Integer id){
+ List<Goods> list1 = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getAppointStore, 1).eq(Goods::getStatus, 2));
+ if(list1.size() > 0){
+ Set<Integer> collect1 = list1.stream().map(Goods::getId).collect(Collectors.toSet());
+ long count = goodsShopService.count(new LambdaQueryWrapper<GoodsShop>().eq(GoodsShop::getShopId, id).in(GoodsShop::getGoodsId, collect1));
+ if(0 < count){
+ return R.fail("门店已被商品使用，不能删除");
+ }
+ }
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
shopService.updateById(shop);
@@ -234,6 +252,12 @@
String phone = shop.getPhone();
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");
@@ -363,6 +387,20 @@
return R.ok();
}
+ /**
+ * 获取手机号的后六位。
+ *
+ * @param phoneNumber 以字符串形式提供的手机号
+ * @return 手机号的后六位
+ * @throws IllegalArgumentException 如果手机号长度不足六位
+ */
+ public String getLastSixDigits(String phoneNumber) {
+ if (phoneNumber == null || phoneNumber.length() < 6) {
+ throw new IllegalArgumentException("手机号长度不足六位");
+ }
+ // 取字符串的最后六位
+ return phoneNumber.substring(phoneNumber.length() - 6);
+ }
/**
@@ -598,7 +636,9 @@
userShop.setUserId(userid);
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
List<Integer> collect = data.stream().map(UserShop::getShopId).collect(Collectors.toList());
- List<Shop> shops = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getId, collect).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ List<Shop> shops = shopService.list(new LambdaQueryWrapper<Shop>()
+ .in(!CollectionUtils.isEmpty(collect),Shop::getId, collect)
+ .eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
List<VerifiableShopVo> list = new ArrayList<>();
for (Shop shop : shops) {
VerifiableShopVo vo = new VerifiableShopVo();
--
Gitblit v1.7.1