新增优化

mitao

2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb

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

@@ -46,15 +46,91 @@
        List<UserTrendsVO> userTrendsList = baseMapper.userTrends(city);
        return null == userTrendsList || userTrendsList.isEmpty() ? new ArrayList<>() : userTrendsList;
    }
    @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;
    }

    @Override
    public UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest) {
        List<String> cityList = userDataCountRequest.getCityList();
        String type = userDataCountRequest.getCountType();
        LambdaQueryChainWrapper<User> userWrapper = lambdaQuery().eq(User::getIsDelete, 0);
        LambdaQueryChainWrapper<User> userWrapper = lambdaQuery().eq(User::getIsDelete, 0).isNotNull(User::getPhone);
        if (null != cityList && !cityList.isEmpty()) {
            userWrapper.in(User::getCityCode, cityList);
        }
        List<User> userList = userWrapper.list();

        // 判断用户是否在管辖城市内下过订单
//        Iterator<User> iterator = userList.iterator();
//        while (iterator.hasNext()) {
//            User user = iterator.next();
//            Integer userId = user.getId();
//            R<Boolean> r = orderClient.orderByUserId(userId);
//            if (!r.getData()) {
//                iterator.remove(); // 安全地移除元素
//            }
//        }

        Integer userNumber = userList.size();
        // 用户总量
        // 计算当前季度时间所包含时间
        int currentYear = Year.now().getValue();
        // 获取当前月份
        Month currentMonth = LocalDate.now().getMonth();
        // 计算当前季度的开始时间和结束时间
        LocalDate startDate = LocalDate.of(currentYear, getStartMonthOfQuarter(currentMonth), 1);
        LocalDate endDate = startDate.plusMonths(2).with(TemporalAdjusters.lastDayOfMonth());
        String startDateStr = String.valueOf(startDate);
        String endDateStr = String.valueOf(endDate);
        // 结果数据封装
        Long increaseNumber;
        // 交易额
        BigDecimal totalMoney = orderClient.tradeMoney(new MoneyQueryRequest(cityList,userDataCountRequest.getCountType())).getData();
        BigDecimal withdrawalTotalMoney = withdrawClient.withdrawalTotalMoney(new MoneyQueryRequest(cityList, type))
                .getData();
        if (OrderConstants.QUARTER.equals(type)) {
            // 用户增长数
            LambdaQueryChainWrapper<User> wrapper = lambdaQuery().ge(User::getCreateTime, startDateStr)
                    .le(User::getCreateTime, endDateStr);
            if (null != cityList && !cityList.isEmpty()) {
                wrapper.in(User::getCityCode, cityList);
            }
            increaseNumber = wrapper.eq(User::getIsDelete, 0).isNotNull(User::getPhone).count();
        } else if (OrderConstants.YEAR.equals(type)) {
            // 用户增长数
            increaseNumber = baseMapper.increaseNumberByYear(cityList);
        } else if (OrderConstants.MONTH.equals(type)) {
            // 用户增长数
            increaseNumber = baseMapper.increaseNumberByMonth(cityList);
        } else {
            // 数量初始化
            increaseNumber = 0L;
        }
        // 查询结果判断
        increaseNumber = null == increaseNumber ? 0L : increaseNumber;
        totalMoney = null == totalMoney ? BigDecimal.ZERO : totalMoney;
        withdrawalTotalMoney = null == withdrawalTotalMoney ? BigDecimal.ZERO : withdrawalTotalMoney;
        return new UserDataCountVO(userNumber, increaseNumber, totalMoney, withdrawalTotalMoney);
    }


    @Override
    public UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds) {
        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()) {
//            userWrapper.in(User::getCityCode, cityList);
//        }
        List<User> userList = userWrapper.list();

        // 判断用户是否在管辖城市内下过订单
@@ -82,23 +158,23 @@
        // 结果数据封装
        Long increaseNumber;
        // 交易额
        BigDecimal totalMoney = orderClient.tradeMoney(cityList, userDataCountRequest.getCountType()).getData();
        BigDecimal totalMoney = orderClient.tradeMoney(new MoneyQueryRequest(cityList,userDataCountRequest.getCountType())).getData();
        BigDecimal withdrawalTotalMoney = withdrawClient.withdrawalTotalMoney(new MoneyQueryRequest(cityList, type))
                .getData();
        if (OrderConstants.QUARTER.equals(type)) {
            // 用户增长数
            LambdaQueryChainWrapper<User> wrapper = lambdaQuery().ge(User::getCreateTime, startDateStr)
                    .le(User::getCreateTime, endDateStr);
            if (null != cityList && !cityList.isEmpty()) {
                wrapper.in(User::getCityCode, cityList);
            }
            increaseNumber = wrapper.eq(User::getIsDelete, 0).count();
                    .le(User::getCreateTime, endDateStr).in(User::getId,userIds);
//            if (null != cityList && !cityList.isEmpty()) {
//                wrapper.in(User::getCityCode, cityList);
//            }
            increaseNumber = wrapper.eq(User::getIsDelete, 0).isNotNull(User::getPhone).count();
        } else if (OrderConstants.YEAR.equals(type)) {
            // 用户增长数
            increaseNumber = baseMapper.increaseNumberByYear(cityList);
            increaseNumber = baseMapper.increaseNumberByYear1(cityList,userIds);
        } else if (OrderConstants.MONTH.equals(type)) {
            // 用户增长数
            increaseNumber = baseMapper.increaseNumberByMonth(cityList);
            increaseNumber = baseMapper.increaseNumberByMonth1(cityList,userIds);
        } else {
            // 数量初始化
            increaseNumber = 0L;