From 7d434ff5c7fe53957f1fe693e418c54ee4effa66 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 25 Dec 2025 14:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E9=80=9A=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/controller/admin/MemberController.java | 1 +
 .../market/service/impl/TbMemberConfigServiceImpl.java       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
index 06526d59b..6d1066c5b 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
@@ -24,6 +24,7 @@ import java.util.Map;
 
 /**
  * 会员配置管理
+ * @author ww
  */
 
 @RestController
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index d947c096a..124177c81 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -421,7 +421,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                         orderInfoService.getOneAs(query().select("sum(pay_amount)").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUser.getUserId())
                                         .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()), BigDecimal.class)
                                 .compareTo(new BigDecimal(item.getValue())) >= 0;
-                case "RECHARGE_AMOUNT" -> paymentService.getOneAs(query().select("sum(amount)")
+                case "RECHARGE_AMOUNT" ->
+                        paymentService.getOneAs(query().select("sum(amount)")
                                 .eq(OrderPayment::getShopId, shopId)
                                 .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN)
                                 .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY)
@@ -439,7 +440,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         upShopUser.setId(shopUser.getId());
         upShopUser.setMemberLevelId(levelConfig.getId());
         upShopUser.setStartTime(LocalDateTime.now());
-        upShopUser.setEndTime(shopUser.getStartTime().plusDays(20000));
+        upShopUser.setEndTime(upShopUser.getStartTime().plusDays(20000));
         upShopUser.setIsVip(1);
         if (shopUser.getJoinTime() != null) {
             upShopUser.setJoinTime(LocalDateTime.now());