Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2025-01-24 a56f8b75910fc008a1eaceb0e53877d931bdfeb8

 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();