feat: 代码重构

hjl

2024-07-16 ec6d43aa07ee0e8faf34498057ebcfbb446aa015

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

@@ -5,12 +5,13 @@
import com.ruoyi.admin.entity.User;
import com.ruoyi.admin.mapper.UserMapper;
import com.ruoyi.admin.request.UserDataCountRequest;
import com.ruoyi.admin.service.OrderService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.service.WithdrawService;
import com.ruoyi.admin.vo.UserDataCountVO;
import com.ruoyi.admin.vo.UserTrendsVO;
import com.ruoyi.common.core.constant.OrderConstants;
import com.ruoyi.order.api.entity.MoneyQueryRequest;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.feignClient.WithdrawClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -34,9 +35,9 @@
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {

    @Resource
    private OrderService orderService;
    private OrderClient orderClient;
    @Resource
    private WithdrawService withdrawService;
    private WithdrawClient withdrawClient;

    @Override
    public List<UserTrendsVO> userTrends(List<String> city) {
@@ -47,6 +48,7 @@
    @Override
    public UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest) {
        List<String> cityList = userDataCountRequest.getCityList();
        String type = userDataCountRequest.getCountType();
        List<User> userList = lambdaQuery().eq(User::getIsDelete, 0).list();
        // 用户总量
        Integer userNumber = null == userList ? 0 : userList.size();
@@ -61,9 +63,11 @@
        String endDateStr = String.valueOf(endDate);
        // 结果数据封装
        Long increaseNumber;
        BigDecimal totalMoney;
        BigDecimal withdrawalTotalMoney;
        if (OrderConstants.QUARTER.equals(userDataCountRequest.getCountType())) {
        // 交易额
        BigDecimal totalMoney = orderClient.tradeMoney(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);
@@ -71,29 +75,15 @@
                wrapper.in(User::getCity, cityList);
            }
            increaseNumber = wrapper.eq(User::getIsDelete, 0).count();
            // 用户总交易额
            totalMoney = orderService.totalMoneyByQuarter(startDateStr, endDateStr, cityList);
            // 用户提现总额
            withdrawalTotalMoney = withdrawService.withdrawalTotalMoney(cityList,startDateStr,endDateStr);
        } else if (OrderConstants.YEAR.equals(userDataCountRequest.getCountType())) {
        } else if (OrderConstants.YEAR.equals(type)) {
            // 用户增长数
            increaseNumber = baseMapper.increaseNumberByYear(cityList);
            // 用户总交易额
            totalMoney = orderService.totalMoneyByYear(cityList);
            // 用户提现总额
            withdrawalTotalMoney = withdrawService.withdrawalTotalMoneyByYear(cityList);
        } else if (OrderConstants.MONTH.equals(userDataCountRequest.getCountType())) {
        } else if (OrderConstants.MONTH.equals(type)) {
            // 用户增长数
            increaseNumber = baseMapper.increaseNumberByMonth(cityList);
            // 用户总交易额
            totalMoney = orderService.totalMoneyByMonth(cityList);
            // 用户提现总额
            withdrawalTotalMoney = withdrawService.withdrawalTotalMoneyByMonth(cityList);
        } else {
            // 数量初始化
            increaseNumber = 0L;
            totalMoney = BigDecimal.ZERO;
            withdrawalTotalMoney = BigDecimal.ZERO;
        }
        // 查询结果判断
        increaseNumber = null == increaseNumber ? 0L : increaseNumber;