From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 12e970a..10f202a 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
@@ -68,10 +68,21 @@
@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,
+ @RequestParam("siteIds") List<String> siteIds) {
+ return R.ok(withdrawService.withdrawPage1(cityList,userIds,nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize),siteIds));
+ }
/**
* 查看提现记录详情
*
@@ -127,9 +138,18 @@
throw new GlobalException("订单信息异常！");
}
Boolean b = withdrawService.confirmWithdraw(openId, userId, order);
- if (!b) {
- throw new GlobalException("提现失败！");
+// 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 +247,14 @@
@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,
+ @RequestParam("siteIds") List<String> siteIds) {
+ return R.ok(withdrawService.withdrawList1(cityList,userId, Page.of(pageNum, pageSize),siteIds));
+ }
+
/************************************* 用户端 **************************************************/
@@ -246,7 +274,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) {
@@ -312,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