xuhy
2025-02-18 9acb17a6871d84a85c373eb90b980f98894e30e0
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java
@@ -120,7 +120,7 @@
    @Override
    public UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds) {
    public UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds,List<String> siteIds) {
        List<String> cityList = userDataCountRequest.getCityList();
        String type = userDataCountRequest.getCountType();
        if (userIds.isEmpty()){
@@ -158,8 +158,12 @@
        // 结果数据封装
        Long increaseNumber;
        // 交易额
        BigDecimal totalMoney = orderClient.tradeMoney(new MoneyQueryRequest(cityList,userDataCountRequest.getCountType())).getData();
        BigDecimal withdrawalTotalMoney = withdrawClient.withdrawalTotalMoney(new MoneyQueryRequest(cityList, type))
        MoneyQueryRequest moneyQueryRequest1 = new MoneyQueryRequest(cityList, userDataCountRequest.getCountType());
        moneyQueryRequest1.setSiteIds(siteIds);
        BigDecimal totalMoney = orderClient.tradeMoney(moneyQueryRequest1).getData();
        MoneyQueryRequest moneyQueryRequest = new MoneyQueryRequest(cityList, type);
        moneyQueryRequest.setSiteIds(siteIds);
        BigDecimal withdrawalTotalMoney = withdrawClient.withdrawalTotalMoney(moneyQueryRequest)
                .getData();
        if (OrderConstants.QUARTER.equals(type)) {
            // 用户增长数