新增优化

mitao

2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/WithdrawController.java

@@ -7,10 +7,12 @@
import com.ruoyi.admin.service.WithdrawService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.UserWithdrawRecordVO;
import com.ruoyi.order.api.entity.Withdraw;
import com.ruoyi.order.api.entity.WithdrawExportRequest;
import com.ruoyi.order.api.feignClient.WithdrawClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -20,6 +22,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -41,6 +44,8 @@
    @Resource
    private UserService userService;

    @Resource
    private TokenService tokenService;
    /**
     * 用户所关联提现记录分页列表
     *
@@ -62,8 +67,19 @@
                                                      String applyForTime, Integer state,
                                                      @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        Page<UserWithdrawRecordVO> page = withdrawClient.withdrawPage(nickname, userPhone, applyForTime,
                state, pageNum, pageSize).getData();

            List<Integer> userIds = userService.lambdaQuery().like(User::getNickname, nickname).list().stream().map(User::getId).collect(Collectors.toList());
        if (nickname!=null&&nickname!="") {
            if (userIds.isEmpty()) {
                return R.ok(new Page<UserWithdrawRecordVO>());
            }
        }
        LoginUser loginUser = tokenService.getLoginUser();
        List<String> cityList = loginUser.getCityList();


        Page<UserWithdrawRecordVO> page = withdrawClient.withdrawPage1(cityList,nickname, userPhone, applyForTime,
                state, pageNum, pageSize,userIds).getData();
        if (null != page) {
            for (UserWithdrawRecordVO record : page.getRecords()) {
                Integer userId = record.getUserId();