From 87dd4cc3baf8254a4d2b59ac032ea8e060489427 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 25 Dec 2025 19:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=BC=80=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/config/FilteredNacosRegistry.java |  1 +
 .../impl/TbMemberConfigServiceImpl.java       | 20 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/config/FilteredNacosRegistry.java b/cash-common/cash-common-api-config/src/main/java/com/czg/config/FilteredNacosRegistry.java
index 36bf22479..ff986780d 100644
--- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/FilteredNacosRegistry.java
+++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/FilteredNacosRegistry.java
@@ -26,6 +26,7 @@ public class FilteredNacosRegistry extends NacosRegistry {
             "removeByMap",
             "getByIdOpt",
             "getOneOpt",
+            "getOneAs",
             "getObjOpt",
             "getObjAs",
             "getObjAsOpt",
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 578db82de..8d8e7736e 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
@@ -12,7 +12,6 @@ import com.czg.account.service.ShopConfigService;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
-import com.czg.constants.PayTypeConstants;
 import com.czg.exception.CzgException;
 import com.czg.market.dto.MemberConfigDTO;
 import com.czg.market.dto.MemberLevelDTO;
@@ -25,7 +24,6 @@ import com.czg.market.enums.PointsConstant;
 import com.czg.market.service.*;
 import com.czg.market.vo.*;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.entity.OrderPayment;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.service.market.mapper.TbMemberConfigMapper;
@@ -381,16 +379,17 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean joinMemberByCondition(Long shopId, Long userId, ShopUser shopUser) {
-        MemberConfigVO memberConfigVO = detail(shopId);
-        if (!memberConfigVO.getIsOpen().equals(1L)) {
-            log.info("超级会员未开启, 店铺id: {}", shopId);
-            return false;
-        }
         if (shopUser == null) {
             log.warn("用户不存在, 店铺id: {}, 用户id: {}", shopId, userId);
             return false;
         }
-        if (shopUser.getStartTime() != null && shopUser.getEndTime() != null && DateUtil.isIn(DateUtil.date(), DateUtil.date(shopUser.getStartTime()), DateUtil.date(shopUser.getEndTime()))) {
+        if (shopUser.getIsVip() == 1 && shopUser.getStartTime() != null && shopUser.getEndTime() != null &&
+                DateUtil.isIn(DateUtil.date(), DateUtil.date(shopUser.getStartTime()), DateUtil.date(shopUser.getEndTime()))) {
+            return false;
+        }
+        MemberConfigVO memberConfigVO = detail(shopId);
+        if (!memberConfigVO.getIsOpen().equals(1L)) {
+            log.info("超级会员未开启, 店铺id: {}", shopId);
             return false;
         }
         MemberLevelConfig levelConfig = levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId).orderBy(MemberLevelConfig::getExperienceValue, true).limit(1));
@@ -417,9 +416,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                         orderInfoService.getOneAs(query().select("IFNULL(sum(pay_amount), 0) as total_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.countMemberInAmount(shopId, shopUser.getId())
-                                .compareTo(new BigDecimal(item.getValue())) >= 0;
+                case "RECHARGE_AMOUNT" -> paymentService.countMemberInAmount(shopId, shopUser.getId())
+                        .compareTo(new BigDecimal(item.getValue())) >= 0;
                 default -> throw new CzgException("会员开通条件类型错误");
             };
             if (!canOpen) {