修改bug

无关风月

2025-01-14 5fbe0ab34f9d2df4f35a8da4b7f4adadc431b531

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -134,13 +134,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 +150,7 @@
                userShop.setShopId(shopId);
                userShop.setRoleType(1);
                userShop.setRoleId(2L);
                userShop.setNickName(sysUser.getNickName());
                userShop.setCreateTime(LocalDateTime.now());
                userShopClient.saveUserShop(userShop);
            }
@@ -173,6 +176,8 @@
            userShop.setShopId(shopId);
            userShop.setRoleType(1);
            userShop.setRoleId(2L);
            userShop.setNickName(sysUser.getNickName());
            userShop.setCreateTime(LocalDateTime.now());
            userShopClient.saveUserShop(userShop);
        }

@@ -205,7 +210,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());
@@ -701,5 +713,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);
    }

}