From a56f8b75910fc008a1eaceb0e53877d931bdfeb8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 19:32:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index 99f177d..7d2aa24 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -153,8 +153,11 @@
R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(7);
BaseSetting data = baseSetting.getData();
if (data != null){
- if (amount.compareTo(new BigDecimal(data.getContent())) < 0){
- return R.fail("充值金额不能小于" + data.getContent() + "元");
+ String content = data.getContent();
+ if (!content.equals("-1")){
+ if (amount.compareTo(new BigDecimal(content)) > 0){
+ return R.fail("充值金额不能小于" + content + "元");
+ }
}
}
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
--
Gitblit v1.7.1