From 0a43447534ca364ceccda80257566466e6329dd4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 19:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 31de0b8..9d6cf00 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
@@ -138,9 +138,9 @@
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())
@@ -340,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