diff --git a/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java index eefa7b58..6912caa2 100644 --- a/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java +++ b/smart-switch-ruoyi/smart-switch-system/src/main/java/com/ruoyi/system/domain/enums/config/ConfigKey.java @@ -19,7 +19,8 @@ public enum ConfigKey { WECHAT_APPROVAL("sys.wechat.approval", "微信小程序敏感内容展示"), DAILY_WITHDRAW_AMOUNT("daily.withdraw.amount", "单日单用户提现限额(元)"), DAILY_WITHDRAW_COUNT("daily.withdraw.count", "单日单用户提现次数(次)"), - NOVERIFY_WITHDRAW_SINGLE("noverify.withdraw.single", "提现单笔免审核额度(元)"); + NOVERIFY_WITHDRAW_SINGLE("noverify.withdraw.single", "提现单笔免审核额度(元)"), + RECHARGE_MIN_SERVICE("recharge.min.service","充值最低服务费(元)"); private final String key; private final String msg; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java index 181d1461..dc52f210 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java @@ -290,10 +290,9 @@ public class TransactionBillServiceImpl implements TransactionBillService, After else if(ServiceType.PERCENT.getType().equals(serviceType)){ // 服务费 BigDecimal serviceCharge = serviceRate.multiply(order.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); - // 最低服务费0.05元 - if (serviceCharge.compareTo(new BigDecimal("0.05")) < 0) { - serviceCharge = new BigDecimal("0.05"); - } + // 最低服务费 + BigDecimal minService = sysConfigService.getBigDecimal(ConfigKey.RECHARGE_MIN_SERVICE); + ServiceUtil.assertion(serviceCharge.compareTo(minService) < 0, "当前套餐金额小于最低服务费,请联系商户处理"); order.setServiceCharge(serviceCharge); // 商户最终到账的金额 = 交易金额 - 服务费 order.setArrivalAmount(order.getMoney().subtract(serviceCharge));