From a2da864dfeb42a81243b1b31bd6eb269819cd4e5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 15:29:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 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 64e4910..ffbdf33 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
@@ -124,6 +124,7 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shopId);
+ appUserShop.setRoleType(1);
R<Void> r = appUserClient.addAppUserShop(appUserShop);
if (R.isError(r)){
throw new RuntimeException("添加失败");
@@ -134,13 +135,15 @@
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(shopId);
userShop.setRoleType(1);
- userShop.setNickName(sysUser.getNickName());
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
if(null == data || data.size() == 0){
userShop = new UserShop();
@@ -148,6 +151,7 @@
userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(sysUser.getNickName());
userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
@@ -173,6 +177,8 @@
userShop.setShopId(shopId);
userShop.setRoleType(1);
userShop.setRoleId(2L);
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
userShopClient.saveUserShop(userShop);
}
@@ -205,7 +211,14 @@
}
Shop shop = shopService.getById(id);
shop.setDelFlag(1);
+
shopService.updateById(shop);
+ // 查询有没有门店绑定这个被删除的门店
+ List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
+ for (Shop shop1 : shops) {
+ shop1.setPid(0);
+ }
+ shopService.updateBatchById(shops);
appUserClient.clearBindShop(shop.getId());
UserShop userShop = new UserShop();
userShop.setShopId(shop.getId());
@@ -260,6 +273,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);
@@ -276,6 +292,7 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
appUserShopClient.delAppUserShop(appUserShop);
//添加新管理员
@@ -283,7 +300,11 @@
appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(shop.getId());
+ appUserShop.setRoleType(1);
appUserClient.addAppUserShop(appUserShop);
+ appUser.setUserType(2);
+ appUserClient.editAppUserById(appUser);
+
//修改管理员
shop.setAppUserId(appUser.getId());
@@ -437,7 +458,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()){
@@ -653,7 +679,7 @@
@PostMapping("/saveWithdrawalAccount")
@ApiOperation(value = "保存提现账户", tags = {"门店后台-财务统计-提现明细"})
- public R saveWithdrawalAccount(SaveWithdrawalAccount saveWithdrawalAccount) {
+ public R saveWithdrawalAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount) {
shopService.saveWithdrawalAccount(saveWithdrawalAccount);
return R.ok();
}
@@ -693,5 +719,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