From 2ce3deea3c9c13ffb5a46419f0a26d76ba57dd59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 25 Sep 2025 17:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/market/vo/UMemberConfigVO.java  | 2 ++
 .../market/service/impl/TbMemberConfigServiceImpl.java    | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java
index 231a4f72..c96e95ef 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/UMemberConfigVO.java
@@ -1,6 +1,7 @@
 package com.czg.market.vo;
 
 import com.czg.market.dto.MemberConfigDTO;
+import com.czg.market.entity.MemberLevelConfig;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.Min;
@@ -24,4 +25,5 @@ public class UMemberConfigVO implements Serializable {
     * kv形式，BIND_PHONE绑定手机号 ORDER订单数 COST_AMOUNT消费金额 RECHARGE_AMOUNT充值金额, true满足 false不满足
     */
    private Map<String, Object> conditionMap;
+   private MemberLevelVO memberLevel;
 }
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 d0b1dfa3..515e491c 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
@@ -132,7 +132,13 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
             }
         }
 
-
+        if (shopUserInfo.getMemberLevelId() == null) {
+            MemberLevelConfig configServiceOne = levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId).orderBy(MemberLevelConfig::getExperienceValue, true)
+                    .limit(1));
+            configVO.setMemberLevel(levelConfigService.detail(configServiceOne.getId()));
+        }else {
+            configVO.setMemberLevel(levelConfigService.detail(shopUserInfo.getMemberLevelId()));
+        }
         return configVO;
     }