From a6cf27e733515a20fc14840f5c63b6c6139b1e33 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 11:16:27 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 7d2aa24..e35bdb6 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
@@ -156,7 +156,7 @@
             String content = data.getContent();
             if (!content.equals("-1")){
                 if (amount.compareTo(new BigDecimal(content)) > 0){
-                    return R.fail("充值金额不能小于" + content + "元");
+                    return R.fail("充值金额不能大于" + content + "元");
                 }
             }
         }
@@ -184,6 +184,21 @@
 
 
     /**
+     * 获取充值上限金额
+     */
+    @GetMapping("rechargeLimit")
+    public R<BigDecimal> rechargeLimit(){
+        R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(7);
+        BaseSetting data = baseSetting.getData();
+        if (data != null){
+            String content = data.getContent();
+            return R.ok(new BigDecimal(content));
+        }
+        return R.ok(new BigDecimal("-1"));
+    }
+
+
+    /**
      * 充值支付回调
      * @param callback
      * @param response

--
Gitblit v1.7.1