From 8ffeb751b3a694e8d1cb6a21bec855f6c49b31b6 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 07 二月 2025 15:38:46 +0800 Subject: [PATCH] 修改物流信息导入模板 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 22 ++++++++++++++++++++-- 1 files changed, 20 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..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 @@ -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(); @@ -181,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