From 047e974de3509cbfa8a8f6558c970d3b2492972c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 19:31:34 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 7 +++++--
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index dadca9e..f422024 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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