From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/WithdrawController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/WithdrawController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/WithdrawController.java
index 5befb35..1e2bd89 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/WithdrawController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/WithdrawController.java
@@ -79,11 +79,17 @@
return R.loginExpire("登录失效！");
}
if (redisService.hasKey(orderId)) {
- return R.repeatedSubmission("请勿重复提交！");
+ return R.fail("该笔订单已申请提现");
+// return R.repeatedSubmission("请勿重复提交！");
}
redisService.setCacheObject(orderId, "1", 10L, TimeUnit.SECONDS);
+ Boolean b = withdrawService.confirmWithdraw(orderId, loginUser.getUserid());
- return R.ok(withdrawService.confirmWithdraw(orderId, loginUser.getUserid()));
+ if (b){
+ return R.ok();
+ }else {
+ return R.fail("该笔订单已申请提现");
+ }
}
@GetMapping("/withdrawRecord")
--
Gitblit v1.7.1