From 60de92280e4cd66a914f41b0681656a62cde346d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 14:50:52 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 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 ff9f10e..c240a54 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,12 @@
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);
+ appUserShop.setRoleType(1);
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
throw new RuntimeException("添加失败");
@@ -132,20 +135,23 @@
throw new RuntimeException("添加失败");
}
//添加门店后台账号和门店关系数据
- SysUser sysUser = sysUserClient.queryUserByUserName(phone).getData();
+ SysUser sysUser = sysUserClient.queryUserByUserNameAndRoleType(phone, 2).getData();
if(null != sysUser){
+ sysUser.setAppUserId(appUser.getId());
+ sysUserClient.updateUser(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.setNickName(sysUser.getNickName());
userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
@@ -160,7 +166,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());
@@ -168,10 +174,18 @@
UserShop userShop = new UserShop();
userShop.setUserId(userId);
- userShop.setShopId(shop.getId());
+ userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
+ }
+
+ // 更换下级会员绑定门店
+ R<List<AppUser>> lowerShopR = appUserClient.setLowerUserShop(appUser.getId(), shopId);
+ if (R.isError(lowerShopR)){
+ throw new RuntimeException("更换下级会员绑定门店失败");
}
return R.ok();
}
@@ -187,6 +201,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);
@@ -244,6 +266,9 @@
}
}
String city = TencentMapUtil.inverseGeographicalAnalysis(shop.getLongitude(), shop.getLatitude(), false);
+ if(!StringUtils.hasLength(city)){
+ city = "510100";
+ }
shop.setProvinceCode(city.substring(0, 2) + "0000");
shop.setCityCode(city.substring(0, 4) + "00");
shop.setDistrictCode(city);
@@ -260,6 +285,7 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
appUserShopClient.delAppUserShop(appUserShop);
//添加新管理员
@@ -267,6 +293,7 @@
appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
appUserClient.addAppUserShop(appUserShop);
//修改管理员
@@ -421,7 +448,12 @@
return R.ok(new ArrayList<>());
}
List<Integer> shopIds = appUserShopList.stream().map(AppUserShop::getShopId).collect(Collectors.toList());
- List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ List<Shop> shopList = shopService.list(new LambdaQueryWrapper<Shop>().in(Shop::getId, shopIds).eq(Shop::getDelFlag, 0));
+ long count = shopList.stream().filter(s -> s.getStatus() == 1).count();
+ if(shopList.size() > 0 && count == 0){
+ return R.fail("操作失败，当前门店已冻结");
+ }
+ shopList = shopList.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());
if(null != appUser.getShopId()){
Optional<Shop> first = shopList.stream().filter(s -> s.getId().equals(appUser.getShopId())).findFirst();
if(first.isPresent()){
@@ -677,5 +709,21 @@
return R.ok(list);
}
+
+ @GetMapping("/getShopStatistics")
+ public R<Map<String, BigDecimal> > getShopStatistics(){
+ List<Shop> shopList = shopService.list();
+ BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
+ BigDecimal lowerLevelGiveawayMoney = BigDecimal.ZERO;
+ for (Shop shop : shopList) {
+ serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
+ lowerLevelGiveawayMoney = lowerLevelGiveawayMoney.add(shop.getLowerLevelGiveawayMoney());
+ }
+ Map<String, BigDecimal> map = new HashMap<>();
+ map.put("serverGiveawayMoney", serverGiveawayMoney);
+ map.put("lowerLevelGiveawayMoney", lowerLevelGiveawayMoney);
+ return R.ok(map);
+ }
+
}
--
Gitblit v1.7.1