From 15bfd012429367bf9b8f03bdc8bb101ae0bdfe4d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 21 三月 2025 15:26:39 +0800
Subject: [PATCH] 修改统计bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java | 203 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 178 insertions(+), 25 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 dd8c7e6..4355f98 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
@@ -12,8 +12,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.MD5Generator;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.OrderClient;
+import com.ruoyi.order.vo.OrderSaleNum;
import com.ruoyi.order.vo.VerifiableShopVo;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.mapper.ShopMapper;
@@ -173,7 +175,8 @@
user.setRoleType(2);
user.setObjectId(shopId);
user.setAppUserId(appUser.getId());
- user.setPassword(phone.substring(5));
+ String s = MD5Generator.generateMD5(phone.substring(5));
+ user.setPassword(s);
user.setCreateTime(new Date());
Long userId = sysUserClient.saveShopUser(user).getData();
@@ -206,8 +209,11 @@
@GetMapping("/getDetailById")
@ApiOperation(value = "门店详情", tags = {"管理后台-门店管理"})
public R<Shop> getDetailById(@RequestParam("id") Integer id){
- Shop byId = shopService.getById(id);
- return R.ok(byId);
+ Shop shop = shopService.getById(id);
+ if (null != shop.getPid() && shop.getPid()==0){
+ shop.setPid(null);
+ }
+ return R.ok(shop);
}
@DeleteMapping("/deleteShop")
@@ -402,6 +408,10 @@
return R.ok();
}
+ public static void main(String[] args) {
+ System.out.println("17780483325".substring(5));
+ }
+
@PutMapping("/freezingOrThawing")
@ApiOperation(value = "门店管理-冻结/解冻门店", tags = {"管理后台-门店管理"})
@@ -413,20 +423,52 @@
shop.setStatus(status);
shopService.updateById(shop);
//处理员工等数据
- UserShop userSh = new UserShop();
- userSh.setShopId(id);
- List<UserShop> data = userShopClient.getUserShop(userSh).getData();
- for (UserShop datum : data) {
- UserShop userShop = new UserShop();
- userShop.setUserId(datum.getUserId());
- List<UserShop> data1 = userShopClient.getUserShop(userShop).getData();
- long count = data1.stream().filter(s -> !s.getShopId().equals(id)).count();
- if(0 == count){
+ if(status == 1){
+ UserShop userSh = new UserShop();
+ userSh.setShopId(id);
+ List<UserShop> data = userShopClient.getUserShop(userSh).getData();
+ for (UserShop datum : data) {
SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
- sysUser.setStatus(status == 1 ? "0" : "1");
+ sysUser.setStatus("0");
sysUserClient.updateUser(sysUser);
}
+ }else{
+ //查询门店所有关联数据
+ UserShop userSh = new UserShop();
+ userSh.setShopId(id);
+ List<UserShop> data = userShopClient.getUserShop(userSh).getData();
+ for (UserShop datum : data) {
+ //查询用户关联的其他店铺
+ UserShop userShop = new UserShop();
+ userShop.setUserId(datum.getUserId());
+ List<UserShop> data1 = userShopClient.getUserShop(userShop).getData();
+ List<UserShop> collect = data1.stream().filter(s -> !s.getShopId().equals(id)).collect(Collectors.toList());
+ if(collect.size() == 0){
+ //如果没有其他店铺，则将用户禁用
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ sysUser.setStatus("1");
+ sysUserClient.updateUser(sysUser);
+ }else{
+ List<Integer> shopIds = collect.stream().map(UserShop::getShopId).collect(Collectors.toList());
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1)
+ .in(Shop::getId, shopIds));
+ //如果用户关联的其他门店都禁用了，将用户禁用
+ if(list.size() == 0){
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ sysUser.setStatus("1");
+ sysUserClient.updateUser(sysUser);
+ }else{
+ //修改默认门店
+ SysUser sysUser = sysUserClient.getSysUser(datum.getUserId()).getData();
+ if(sysUser.getObjectId().equals(id)){
+ sysUser.setObjectId(list.get(0).getId());
+ sysUserClient.updateUser(sysUser);
+ }
+ }
+ }
+ }
}
+
return R.ok();
}
@@ -466,7 +508,8 @@
userShop.setRoleType(1);
List<UserShop> data = userShopClient.getUserShop(userShop).getData();
SysUser userData = sysUserClient.getSysUser(data.get(0).getUserId()).getData();
- userData.setPassword(userData.getPhonenumber().substring(5));
+ String s = MD5Generator.generateMD5(userData.getPhonenumber().substring(5));
+ userData.setPassword(s);
sysUserClient.resetPassword(userData);
}
return R.ok();
@@ -639,8 +682,17 @@
@PostMapping("/getShopIdByName")
public R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName){
List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
- .like(Shop::getName, shopName));
+ .like(Shop::getName, shopName)
+ .eq(Shop::getDelFlag, 0));
return R.ok(list.stream().map(Shop::getId).collect(Collectors.toSet()));
+ }
+
+ @PostMapping("/getManagerByManagerName")
+ public R<Set<Long>> getManagerByManagerName(@RequestParam("managerName") String managerName){
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>()
+ .like(Shop::getShopManager, managerName)
+ .eq(Shop::getDelFlag, 0));
+ return R.ok(list.stream().map(Shop::getAppUserId).collect(Collectors.toSet()));
}
/**
@@ -650,11 +702,17 @@
@ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
- if(null == shopId){
- shopId = 0;
- }
- Integer serviceOrder = orderClient.getShopSaleNum(shopId, 1).getData();
- Integer goodsOrder = orderClient.getShopSaleNum(shopId, 2).getData();
+
+ OrderSaleNum serviceOrderSaleNum = new OrderSaleNum();
+ serviceOrderSaleNum.setShopIds(null == shopId ? new ArrayList<>() : Arrays.asList(shopId));
+ serviceOrderSaleNum.setType(1);
+ Integer serviceOrder = orderClient.getShopSaleNumByShopIds(serviceOrderSaleNum).getData();
+
+ OrderSaleNum goodsOrderSaleNum = new OrderSaleNum();
+ goodsOrderSaleNum.setShopIds(null == shopId ? new ArrayList<>() : Arrays.asList(shopId));
+ goodsOrderSaleNum.setType(2);
+ Integer goodsOrder = orderClient.getShopSaleNumByShopIds(goodsOrderSaleNum).getData();
+
shopStatistics.setTotalOrder(serviceOrder + goodsOrder);
shopStatistics.setServiceOrder(serviceOrder);
shopStatistics.setGoodsOrder(goodsOrder);
@@ -748,6 +806,21 @@
return R.ok();
}
+ @PostMapping("/saveWithdrawalAppletAccount")
+ @ApiOperation(value = "保存提现账户", tags = {"小程序-个人中心-门店管理-门店钱包"})
+ public R saveWithdrawalAppletAccount(@RequestBody SaveWithdrawalAccount saveWithdrawalAccount){
+
+ Shop shop = shopService.getById(saveWithdrawalAccount.getShopId());
+ if(null != shop){
+ shop.setReceiverAccountNoEnc(saveWithdrawalAccount.getReceiverAccountNoEnc());
+ shop.setReceiverNameEnc(saveWithdrawalAccount.getReceiverNameEnc());
+ shop.setReceiverAccountType(saveWithdrawalAccount.getReceiverAccountType());
+ shop.setReceiverBankChannelNo(saveWithdrawalAccount.getReceiverBankChannelNo());
+ shopService.updateById(shop);
+ }
+ return R.ok();
+ }
+
/**
* 获取所有门店
@@ -773,6 +846,21 @@
}
+ @ResponseBody
+ @GetMapping("/verifyAppletConfiguration")
+ @ApiOperation(value = "判断是否有提现账户", tags = {"门店后台-财务管理-提现明细","小程序-个人中心-门店管理-门店钱包"})
+ public R verifyAppletConfiguration(Integer shopId){
+ Shop shop = shopService.getById(shopId);
+ if(StringUtils.hasLength(shop.getReceiverAccountNoEnc())){
+ return R.ok(true);
+ }
+ return R.ok(false);
+ }
+
+
+
+
+
@ResponseBody
@GetMapping("/getBankSerialNumber")
@@ -785,19 +873,84 @@
@GetMapping("/getShopStatistics")
- public R<Map<String, BigDecimal> > getShopStatistics(){
- List<Shop> shopList = shopService.list();
+ public R<Map<String, BigDecimal> > getShopStatistics(@RequestParam("shopId") Integer shopId){
+ LambdaQueryWrapper<Shop> queryWrapper = new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1);
+ if(null != shopId && 0 != shopId){
+ queryWrapper.eq(Shop::getId, shopId);
+ }
+ List<Shop> shopList = shopService.list(queryWrapper);
BigDecimal serverGiveawayMoney = BigDecimal.ZERO;
- BigDecimal lowerLevelGiveawayMoney = BigDecimal.ZERO;
+ BigDecimal giveawayMoney = BigDecimal.ZERO;
for (Shop shop : shopList) {
serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
- lowerLevelGiveawayMoney = lowerLevelGiveawayMoney.add(shop.getLowerLevelGiveawayMoney());
+ giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
}
Map<String, BigDecimal> map = new HashMap<>();
map.put("serverGiveawayMoney", serverGiveawayMoney);
- map.put("lowerLevelGiveawayMoney", lowerLevelGiveawayMoney);
+ map.put("giveawayMoney", giveawayMoney);
return R.ok(map);
}
+ /**
+ * 获取指定用户的服务商
+ * @return
+ */
+ @GetMapping("/getServiceProvider")
+ public R<Shop> getServiceProvider(@RequestParam("appUserId") Long appUserId){
+ //向上找获取第一个开店的门店
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ AppUser appUser = appUserClient.getAppUserById(appUserId);
+ //上级集合，防止循环关联
+ Set<Long> pid = new HashSet<>();
+ Shop shop = getSuperiorStore(appUser, list, 1, 1, pid);
+ return R.ok(shop);
+ }
+
+
+
+ public Shop getSuperiorStore(AppUser appUser, List<Shop> list, Integer hierarchy, Integer num, Set<Long> pid){
+ if(null == appUser.getInviteUserId()){
+ return null;
+ }
+ if(pid.contains(appUser.getInviteUserId())){
+ return null;
+ }
+ AppUser appUser1 = appUserClient.getAppUserById(appUser.getInviteUserId());
+ if(null != appUser1){
+ Optional<Shop> first = list.stream().filter(shop -> shop.getAppUserId().equals(appUser1.getId())).findFirst();
+ if(first.isPresent()){
+ if(hierarchy.equals(num)){
+ return first.get();
+ }
+ num++;
+ }
+ }
+ return getSuperiorStore(appUser1, list, hierarchy, num, pid);
+ }
+
+
+
+
+
+
+
+
+
+
+ /**
+ * 获取指定用户的高级服务商
+ * @return
+ */
+ @GetMapping("/getSuperiorServiceProvider")
+ public R<Shop> getSuperiorServiceProvider(@RequestParam("appUserId") Long appUserId){
+ //向上找获取第一个开店的门店
+ List<Shop> list = shopService.list(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag, 0).eq(Shop::getStatus, 1));
+ AppUser appUser = appUserClient.getAppUserById(appUserId);
+ //上级集合，防止循环关联
+ Set<Long> pid = new HashSet<>();
+ Shop shop = getSuperiorStore(appUser, list, 2, 1, pid);
+ return R.ok(shop);
+ }
+
}
--
Gitblit v1.7.1