From 525fa7ec2751ab54f3bbbf7765b29fc037d0fd14 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 16:43:50 +0800
Subject: [PATCH] bug 修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
index d406bfa..acb54bd 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java
@@ -79,8 +79,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));
}
/**
* 查看提现记录详情
@@ -249,8 +250,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));
}
@@ -319,7 +321,7 @@
withdrawDetailVO.setServeId(order.getServeId());
withdrawDetailVO.setServeName(order.getServeName());
withdrawDetailVO.setServePrice(order.getServePrice());
- withdrawDetailVO.setOrderMoney(order.getOrderMoney());
+ withdrawDetailVO.setOrderMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());
withdrawDetailVO.setReservationName(order.getReservationName());
withdrawDetailVO.setReservationPhone(order.getReservationPhone());
withdrawDetailVO.setReservationAddress(order.getReservationAddress());
@@ -338,6 +340,7 @@
withdrawDetailVO.setWithdrawalState(withdraw.getState());
withdrawDetailVO.setWithdrawalTime(withdraw.getCreateTime());
}
+ withdrawDetailVO.setPackageInfo(order.getPackageInfo());
withdrawDetailVO.setAddress(order.getAddress());
if (null != serveRecord) {
withdrawDetailVO.setPhoto(serveRecord.getPhoto());
--
Gitblit v1.7.1