修改统计bug

Pu Zhibing

2025-03-18 eb428cb6839049970e67264f4eafc612e5bcaa38

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

@@ -408,6 +408,10 @@
        return R.ok();
    }

    public static void main(String[] args) {
        System.out.println("17780483325".substring(5));
    }


    @PutMapping("/freezingOrThawing")
    @ApiOperation(value = "门店管理-冻结/解冻门店", tags = {"管理后台-门店管理"})
@@ -698,9 +702,7 @@
    @ApiOperation(value = "门店统计", tags = {"管理后台-首页统计"})
    public R<ShopStatistics> shopStatistics(@ApiParam("门店id") Integer shopId) {
        ShopStatistics shopStatistics = shopMapper.getShopStatistics(shopId);
        List<Integer> shopIds;

        shopIds = shopService.list(new LambdaQueryWrapper<Shop>()
        List<Integer> shopIds = shopService.list(new LambdaQueryWrapper<Shop>()
                        .eq(Shop::getDelFlag, 0)
                        .eq(shopId !=null,Shop::getId, shopId))
                .stream()
@@ -817,6 +819,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();
    }


    /**
     * 获取所有门店
@@ -842,6 +859,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")
@@ -864,7 +896,7 @@
        BigDecimal giveawayMoney = BigDecimal.ZERO;
        for (Shop shop : shopList) {
            serverGiveawayMoney = serverGiveawayMoney.add(shop.getServerGiveawayMoney());
            giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney());
            giveawayMoney = giveawayMoney.add(shop.getGiveawayMoney().add(shop.getLowerLevelGiveawayMoney()));
        }
        Map<String, BigDecimal> map = new HashMap<>();
        map.put("serverGiveawayMoney", serverGiveawayMoney);
@@ -874,7 +906,6 @@

    /**
     * 获取指定用户的服务商
     * @param userId
     * @return
     */
    @GetMapping("/getServiceProvider")
@@ -909,13 +940,15 @@
        }
        return getSuperiorStore(appUser1, list, hierarchy, num, pid);
    }
    
    
    
    
    
    
    










    /**
     * 获取指定用户的高级服务商