From c8e70fd3a03bdc4ed953d58e08c60d22ca3f39d1 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Sun, 20 Oct 2024 11:36:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdd/front/service/impl/RechargeServiceImpl.java    | 10 +++++-----
 .../main/java/com/mdd/front/vo/RechargeConfigVo.java   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java
index d216a03c..ece4b7df 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java
@@ -51,8 +51,8 @@ public class RechargeServiceImpl implements IRechargeService {
         Map<String, String> config = ConfigUtils.get("recharge");
 
         RechargeConfigVo vo = new RechargeConfigVo();
-        vo.setOpenRecharge(Integer.parseInt(config.getOrDefault("openRecharge", "0")));
-        vo.setMinRechargeMoney(new BigDecimal(config.getOrDefault("minRechargeMoney", "0")));
+        vo.setStatus(Integer.parseInt(config.getOrDefault("status", "0")));
+        vo.setMinAmount(new BigDecimal(config.getOrDefault("min_amount", "0")));
         vo.setUserMoney(user.getUserMoney());
         return vo;
     }
@@ -103,12 +103,12 @@ public class RechargeServiceImpl implements IRechargeService {
     @Override
     public Map<String, Object> placeOrder(Integer userId, Integer terminal, RechargeValidate rechargeValidate) {
         RechargeConfigVo config = this.config(userId);
-        if (config.getOpenRecharge().equals(0)) {
+        if (config.getStatus().equals(0)) {
             throw new OperateException("充值功能已关闭");
         }
 
-        if (rechargeValidate.getOrderAmount().compareTo(config.getMinRechargeMoney()) < 0) {
-            throw new OperateException("充值金额不能少于" + config.getMinRechargeMoney());
+        if (rechargeValidate.getOrderAmount().compareTo(config.getMinAmount()) < 0) {
+            throw new OperateException("充值金额不能少于" + config.getMinAmount());
         }
 
         RechargeOrder order = new RechargeOrder();
diff --git a/server/like-front/src/main/java/com/mdd/front/vo/RechargeConfigVo.java b/server/like-front/src/main/java/com/mdd/front/vo/RechargeConfigVo.java
index d597308f..5c3730cc 100644
--- a/server/like-front/src/main/java/com/mdd/front/vo/RechargeConfigVo.java
+++ b/server/like-front/src/main/java/com/mdd/front/vo/RechargeConfigVo.java
@@ -14,10 +14,10 @@ public class RechargeConfigVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("是否开启充值: 0=否,1=是")
-    private Integer openRecharge;
+    private Integer status;
 
     @ApiModelProperty("最低充值金额")
-    private BigDecimal minRechargeMoney;
+    private BigDecimal minAmount;
 
     @ApiModelProperty("用户钱包")
     private BigDecimal userMoney;