Merge remote-tracking branch 'origin/dev' into dev

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

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

@@ -2,15 +2,19 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.Franchisee;
import com.ruoyi.admin.entity.User;
import com.ruoyi.admin.service.FranchiseeService;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.service.WithdrawService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.order.api.entity.UserWithdrawRecordVO;
import com.ruoyi.order.api.entity.Withdraw;
import com.ruoyi.order.api.entity.WithdrawExportRequest;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.*;
import com.ruoyi.order.api.feignClient.OrderClient;
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;
@@ -19,7 +23,10 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -39,8 +46,14 @@
    @Resource
    private WithdrawClient withdrawClient;
    @Resource
    private OrderClient orderClient;
    @Resource
    private UserService userService;

    @Resource
    private TokenService tokenService;
    @Resource
    private FranchiseeService franchiseeService;
    /**
     * 用户所关联提现记录分页列表
     *
@@ -62,8 +75,30 @@
                                                      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();


        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String[] siteIds = new String[0];
        if (franchiseeId!=null){
            Franchisee byId = franchiseeService.getById(franchiseeId);
            siteIds = byId.getSiteIds().split(",");
            if (loginUser.getIsFranchisee()&&siteIds.length==0){
                return R.ok();
            }
        }


        Page<UserWithdrawRecordVO> page = withdrawClient.withdrawPage1(cityList,nickname, userPhone, applyForTime,
                state, pageNum, pageSize,userIds, Arrays.asList(siteIds)).getData();
        if (null != page) {
            for (UserWithdrawRecordVO record : page.getRecords()) {
                Integer userId = record.getUserId();
@@ -91,7 +126,17 @@
            @ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true)
    })
    public R<Withdraw> withdrawRecordDetail(@RequestParam Long id) {
        return withdrawClient.withdrawRecordDetail(id);
        Withdraw data = withdrawClient.withdrawRecordDetail(id).getData();
        User user = userService.getById(data.getUserId());
        UserVO userVO = new UserVO();
        BeanUtils.copyProperties(user, userVO);
        data.setUser(userVO);
        Order data1 = orderClient.detail(data.getOrderId()).getData();
        data.setSubsidy(data1.getSubsidy());
        data.setServeName(data1.getServeName());
        data.setServePrice(data1.getServePrice());
        data.setReservationAddress(data1.getReservationAddress());
        return R.ok(data);
    }

    /**