大屏接口bug修改

无关风月

2 天以前 9411a5a1eec19f3460eca9a6c82ebb46dc4e2f0d

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

@@ -5,13 +5,11 @@
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.order.entity.Order;
import com.ruoyi.order.entity.ServeRecord;
import com.ruoyi.order.entity.Withdraw;
import com.ruoyi.order.entity.WithdrawalSetting;
import com.ruoyi.order.entity.*;
import com.ruoyi.order.request.WithdrawExportRequest;
import com.ruoyi.order.service.OrderService;
import com.ruoyi.order.service.ServeRecordService;
import com.ruoyi.order.service.WithdrawRecordService;
import com.ruoyi.order.service.WithdrawService;
import com.ruoyi.order.vo.MoneyQueryRequest;
import com.ruoyi.order.vo.UserWithdrawRecordVO;
@@ -23,7 +21,11 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -41,6 +43,8 @@

    @Resource
    private WithdrawService withdrawService;
    @Resource
    private WithdrawRecordService withdrawRecordService;
    @Resource
    private OrderService orderService;
    @Resource
@@ -79,8 +83,9 @@
                                                      @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)));
                                                      @RequestParam(name = "userIds") List<Integer> userIds,
                                                       @RequestParam("siteIds") List<String> siteIds) {
        return R.ok(withdrawService.withdrawPage1(cityList,userIds,nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize),siteIds));
    }
    /**
     * 查看提现记录详情
@@ -95,6 +100,8 @@
    public R<Withdraw> withdrawRecordDetail(@RequestParam("id") Long id) {
        Withdraw withdraw = withdrawService.lambdaQuery().eq(Withdraw::getId, id)
                .eq(Withdraw::getIsDelete, 0).one();
        List<WithdrawRecord> one = withdrawRecordService.lambdaQuery().eq(WithdrawRecord::getWithdrawId, id).list();
        withdraw.setWithdrawRecords(one);
        return R.ok(withdraw);
    }

@@ -137,10 +144,26 @@
                throw new GlobalException("订单信息异常！");
            }
            Boolean b = withdrawService.confirmWithdraw(openId, userId, order);
//            if (!b) {
//                throw new GlobalException("提现失败！");
//            }
            if (!b) {
                throw new GlobalException("提现失败！");
            }
            WithdrawRecord withdrawRecord = new WithdrawRecord();
            withdrawRecord.setWithdrawId(withdraw.getId());
            withdrawRecord.setOrderId(withdraw.getOrderId());
            withdrawRecord.setUserId(withdraw.getUserId());
            withdrawRecord.setWithdrawType(2);
            withdrawRecord.setCreateTime(new Date());
            withdrawRecord.setAuditStatus(1);
            withdrawRecordService.save(withdrawRecord);
        }else {
            WithdrawRecord withdrawRecord = new WithdrawRecord();
            withdrawRecord.setWithdrawId(withdraw.getId());
            withdrawRecord.setOrderId(withdraw.getOrderId());
            withdrawRecord.setUserId(withdraw.getUserId());
            withdrawRecord.setWithdrawType(2);
            withdrawRecord.setCreateTime(new Date());
            withdrawRecord.setAuditStatus(0);
            withdrawRecordService.save(withdrawRecord);
            Order order = orderService.lambdaQuery()
                    .eq(Order::getId, withdraw.getOrderId())
                    .eq(Order::getIsDelete, 0).one();
@@ -249,8 +272,9 @@
    @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)));
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       @RequestParam("siteIds") List<String> siteIds) {
        return R.ok(withdrawService.withdrawList1(cityList,userId, Page.of(pageNum, pageSize),siteIds));
    }


@@ -297,7 +321,20 @@
                .eq(Withdraw::getIsDelete, 0).orderByDesc(Withdraw::getCreateTime)
                .page(Page.of(pageNum, pageSize)));
    }
    @GetMapping("/confirmMoney")

    R<String> confirmWithdraw(@RequestParam("id")String id){
        Withdraw withdraw = withdrawService.getById(id);
        WithdrawRecord withdrawRecord = new WithdrawRecord();
        withdrawRecord.setWithdrawId(withdraw.getId());
        withdrawRecord.setOrderId(withdraw.getOrderId());
        withdrawRecord.setUserId(withdraw.getUserId());
        withdrawRecord.setWithdrawType(3);
        withdrawRecord.setCreateTime(new Date());
        withdrawRecord.setAuditStatus(1);
        withdrawRecordService.save(withdrawRecord);
        return R.ok();
    }
    @GetMapping("/withdrawDetailByUser")
    @ApiOperation(value = "提现订单详情", tags = {"用户端"})
    public R<WithdrawDetailVO> withdrawDetailByUser(@RequestParam("orderId") String orderId) {
@@ -338,10 +375,15 @@
            withdrawDetailVO.setWithdrawalState(withdraw.getState());
            withdrawDetailVO.setWithdrawalTime(withdraw.getCreateTime());
        }
        withdrawDetailVO.setPackageInfo(order.getPackageInfo());
        withdrawDetailVO.setAddress(order.getAddress());
        if (null != serveRecord) {
            withdrawDetailVO.setPhoto(serveRecord.getPhoto());
        }
        List<WithdrawRecord> list = withdrawRecordService.lambdaQuery().eq(WithdrawRecord::getOrderId, orderId)
                .eq(WithdrawRecord::getWithdrawId, withdraw.getId())
                .eq(WithdrawRecord::getUserId, withdraw.getUserId()).list();
        withdrawDetailVO.setWithdrawRecords(list);
        return R.ok(withdrawDetailVO);
    }