8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

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

@@ -68,10 +68,20 @@
                                                      @RequestParam(value = "applyForTime", required = false) String applyForTime,
                                                      @RequestParam(value = "state", required = false) Integer state,
                                                      @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(withdrawService.withdrawPage(nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize)));
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      @RequestParam(name = "userIds") List<Integer> userIds) {
        return R.ok(withdrawService.withdrawPage(userIds,nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize)));
    }

    @GetMapping(value = "/withdrawPage1")
    public R<Page<UserWithdrawRecordVO>> withdrawPage1(@RequestParam(value = "cityList", required = false)List<String> cityList,@RequestParam(value = "nickname", required = false) String nickname,
                                                      @RequestParam(value = "userPhone", required = false) String userPhone,
                                                      @RequestParam(value = "applyForTime", required = false) String applyForTime,
                                                      @RequestParam(value = "state", required = false) Integer state,
                                                      @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      @RequestParam(name = "userIds") List<Integer> userIds) {
        return R.ok(withdrawService.withdrawPage1(cityList,userIds,nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize)));
    }
    /**
     * 查看提现记录详情
     *
@@ -130,6 +140,15 @@
            if (!b) {
                throw new GlobalException("提现失败！");
            }
        }else {
            Order order = orderService.lambdaQuery()
                    .eq(Order::getId, withdraw.getOrderId())
                    .eq(Order::getIsDelete, 0).one();
            if (null == order) {
                throw new GlobalException("订单信息异常！");
            }
            order.setIsWithdrawal(0);
            orderService.updateById(order);
        }
        update = update && withdrawService.updateById(withdraw);
        return R.ok(update);
@@ -227,6 +246,13 @@
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(withdrawService.withdrawList(userId, Page.of(pageNum, pageSize)));
    }
    @GetMapping(value = "/withdrawList1")
    public R<Page<UserWithdrawRecordVO>> withdrawList1(@RequestParam("cityList") List<String> cityList,@RequestParam("userId") Integer userId,
                                                      @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(withdrawService.withdrawList1(cityList,userId, Page.of(pageNum, pageSize)));
    }


    /************************************* 用户端 **************************************************/

@@ -246,7 +272,7 @@
     */
    @ApiOperation(value = "用户提交提现申请", tags = {"用户端"})
    @GetMapping(value = "/confirmWithdrawByUser")
    public R<Boolean> confirmWithdrawByUser(@RequestParam("orderId") String orderId,
    public synchronized R<Boolean> confirmWithdrawByUser(@RequestParam("orderId") String orderId,
                                            @RequestParam("userId") Integer userId,
                                            @RequestParam("openId") String openId,
                                            @RequestParam("userPhone") String userPhone) {