feat: 代码重构

hjl

2024-07-16 ec6d43aa07ee0e8faf34498057ebcfbb446aa015

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

@@ -3,23 +3,28 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.service.EvaluateService;
import com.ruoyi.admin.service.OrderService;
import com.ruoyi.admin.entity.User;
import com.ruoyi.admin.service.UserService;
import com.ruoyi.admin.service.WithdrawService;
import com.ruoyi.admin.vo.UserWithdrawRecordRequestVO;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.api.entity.EvaluatePageVO;
import com.ruoyi.order.api.entity.Order;
import com.ruoyi.order.api.entity.UserWithdrawRecordVO;
import com.ruoyi.order.api.entity.WithdrawalSetting;
import com.ruoyi.order.api.feignClient.EvaluateClient;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.feignClient.WithdrawClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -35,13 +40,13 @@
public class UserManageController {

    @Resource
    private OrderService orderService;
    @Resource
    private EvaluateService evaluateService;
    @Resource
    private WithdrawService withdrawService;
    @Resource
    private UserService userService;
    @Resource
    private OrderClient orderClient;
    @Resource
    private EvaluateClient evaluateClient;
    @Resource
    private WithdrawClient withdrawClient;

    /**
     * 用户信息分页列表
@@ -113,15 +118,14 @@
    @ApiOperation(value = "用户详情-订单记录分页列表", tags = {"后台-用户管理-用户列表"})
    @GetMapping(value = "/orderList")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "用户id", name = "userId", dataType = "Integer"),
            @ApiImplicitParam(value = "用户id", name = "userId", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<Order>> orderList(Integer userId,
    public R<IPage<Order>> orderList(@RequestParam("userId") Integer userId,
                                     @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(orderService.lambdaQuery().eq(Order::getUserId, userId)
                .eq(Order::getIsDelete, 0).page(Page.of(pageNum, pageSize)));
        return R.ok(orderClient.orderList(userId, pageNum, pageSize).getData());
    }

    /**
@@ -139,11 +143,10 @@
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<Evaluate>> evaluateList(Integer userId,
                                           @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(evaluateService.lambdaQuery().eq(Evaluate::getUserId, userId)
                .eq(Evaluate::getIsDelete, 0).page(Page.of(pageNum, pageSize)));
    public R<Page<EvaluatePageVO>> evaluateList(Integer userId,
                                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return evaluateClient.evaluateList(userId, pageNum, pageSize);
    }

    /**
@@ -156,10 +159,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "评价记录id", name = "id", dataType = "Integer", required = true)
    })
    public R<Void> deleteEvaluateRecord(@RequestParam Integer id) {
        Evaluate evaluate = evaluateService.getById(id);
        evaluate.setIsDelete(1);
        return evaluateService.updateById(evaluate) ? R.ok() : R.fail();
    public R<String> deleteEvaluateRecord(@RequestParam Integer id) {
        return evaluateClient.batchDelete(String.valueOf(id));
    }

    /**
@@ -169,8 +170,11 @@
     */
    @ApiOperation(value = "关闭/开启审核", tags = {"后台-用户管理-用户列表"})
    @GetMapping(value = "/enableProcess")
    public R<Boolean> enableProcess(@RequestParam Integer enableProcess) {
        return R.ok(withdrawService.enableProcess(enableProcess));
    @ApiImplicitParams({
            @ApiImplicitParam(value = "审核状态(0:未开启，1:已开启)", name = "enableProcess", dataType = "Integer", required = true)
    })
    public R<Boolean> enableProcess(@RequestParam("enableProcess") Integer enableProcess) {
        return withdrawClient.enableProcess(enableProcess);
    }

    /**
@@ -181,7 +185,16 @@
     */
    @GetMapping(value = "/withdrawProcess")
    public R<WithdrawalSetting> withdrawProcess() {
        return R.ok(withdrawService.withdrawProcess());
        return withdrawClient.withdrawProcess();
    }

    /**
     * 全局审核状态
     */
    @ApiOperation(value = "全局审核状态", tags = {"后台-用户管理-用户列表"})
    @GetMapping(value = "/withdrawState")
    public R<WithdrawalSetting> withdrawState() {
        return withdrawClient.withdrawProcess();
    }

    /**
@@ -192,17 +205,17 @@
     * @param pageSize 每页显示条数
     * @return 分页列表
     */
    @ApiOperation(value = "用户详情/用户提现管理-提现记录分页列表", tags = {"后台-用户管理-用户列表"})
    @ApiOperation(value = "用户详情-提现记录分页列表", tags = {"后台-用户管理-用户列表"})
    @GetMapping(value = "/withdrawList")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "用户id(用户提现管理模块 该值传nul)", name = "userId", dataType = "Integer"),
            @ApiImplicitParam(value = "用户id", name = "userId", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<UserWithdrawRecordRequestVO> withdrawList(Integer userId,
                                                       @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(withdrawService.withdrawList(userId, Page.of(pageNum, pageSize)));
    public R<Page<UserWithdrawRecordVO>> withdrawList(@RequestParam Integer userId,
                                                      @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return withdrawClient.withdrawList(userId, pageNum, pageSize);
    }

    /**
@@ -215,10 +228,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true)
    })
    public R<Void> deleteWithdrawRecord(@RequestParam Integer id) {
        Withdraw withdraw = withdrawService.getById(id);
        withdraw.setIsDelete(1);
        return withdrawService.updateById(withdraw) ? R.ok() : R.fail();
    public R<String> deleteWithdrawRecord(@RequestParam Integer id) {
        return withdrawClient.batchDelete(String.valueOf(id));
    }

    /**
@@ -232,37 +243,26 @@
    @GetMapping(value = "/withdrawExamine")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "审批意见", name = "opinion", dataType = "String", required = true),
            @ApiImplicitParam(value = "审批意见", name = "opinion", dataType = "String"),
            @ApiImplicitParam(value = "审批同意/不同意(1同意;2驳回)", name = "state", dataType = "Integer", required = true)
    })
    public R<String> withdrawExamine(@RequestParam Integer id, @RequestParam Integer state, @RequestParam String opinion) {
        Withdraw withdraw = withdrawService.lambdaQuery().eq(Withdraw::getId, id).eq(Withdraw::getIsDelete, 0)
                .eq(Withdraw::getState, 0).one();
    public R<String> withdrawExamine(@RequestParam Integer id, @RequestParam Integer state, String opinion) {
        com.ruoyi.order.api.entity.Withdraw withdraw = withdrawClient.withdrawRecordDetail(id).getData();
        if (null == withdraw) {
            return R.fail(503, "当前提现记录审批状态异常！");
            throw new GlobalException("提现记录不存在或已删除！");
        }
        // 修改审批状态及审批意见
        withdraw.setState(state);
        withdraw.setOpinions(opinion);
        // 同意提现申请，更改订单提现状态
        boolean update = true;
        if (Constants.ONE.equals(state)) {
            update = orderService.lambdaUpdate().set(Order::getIsWithdrawal, Constants.ONE)
                    .eq(Order::getId, withdraw.getOrderId()).eq(Order::getIsDelete, 0).update();
        User user = userService.lambdaQuery()
                .eq(User::getId, withdraw.getUserId())
                .eq(User::getIsDelete, 0).one();
        if (null == user) {
            throw new GlobalException("提交申请的用户信息不存在！");
        }
        update = update && withdrawService.updateById(withdraw);
        return update ? R.ok(null, "审批成功！") : R.fail("审批失败！");
    }

    /**
     * 用户提现记录导出
     *
     * @param idList 提现记录id
     */
    @ApiOperation(value = "用户提现管理-excel导出用户提现记录", tags = {"后台-用户管理-用户列表"})
    @PostMapping(value = "/excelExport")
    public R<String> excelExport(@RequestBody List<String> idList, HttpServletResponse response) {
        return withdrawService.excelExport(idList, response);
        Boolean data = withdrawClient.withdrawExamine(id, state, opinion, user.getOpenId(), user.getId()).getData();
        if (null != data) {
            return data ? R.ok(null, "审批成功！") : R.fail("审批失败！");
        } else {
            return R.fail("审批失败！");
        }
    }

}