11.6

无关风月

2025-04-22 67f416634f95c81e618123b826e18a57ae08220d

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/UserServiceImpl.java

@@ -48,6 +48,9 @@
    }
    @Override
    public List<UserTrendsVO> userTrends1(List<String> city,List<Integer> userIds) {
        if (userIds.isEmpty()){
            return new ArrayList<>();
        }
        List<UserTrendsVO> userTrendsList = baseMapper.userTrends1(city,userIds);
        return null == userTrendsList || userTrendsList.isEmpty() ? new ArrayList<>() : userTrendsList;
    }
@@ -117,9 +120,12 @@


    @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()){
            return new UserDataCountVO(null,null,null,null);
        }

        LambdaQueryChainWrapper<User> userWrapper = lambdaQuery().eq(User::getIsDelete, 0).isNotNull(User::getPhone).in(!userIds.isEmpty(),User::getId,userIds);
//        if (null != cityList && !cityList.isEmpty()) {
@@ -152,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)) {
            // 用户增长数