From c2e4ccc124b275b02ecc9f6516cbf134939751f5 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, 9 Oct 2025 16:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BC=9A=E5=91=98=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/account/dto/shopuser/ShopUserDTO.java | 1 +
 .../service/account/service/impl/AShopUserServiceImpl.java  | 6 ++++++
 .../src/main/resources/mapper/ShopUserMapper.xml            | 4 +++-
 .../market/service/impl/TbMemberLevelConfigServiceImpl.java | 4 +++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java
index d01d7171..f30edfa4 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java
@@ -24,4 +24,5 @@ public class ShopUserDTO extends ShopUser {
      * 充值金额
      */
     private BigDecimal rechargeAmount;
+    private String memberLevelName;
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
index 43e3df4c..bf1af34f 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java
@@ -12,7 +12,9 @@ import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
 import com.czg.account.service.UserInfoService;
 import com.czg.exception.ApiNotPrintException;
+import com.czg.market.entity.MemberLevelConfig;
 import com.czg.market.entity.MkShopCouponRecord;
+import com.czg.market.service.MemberLevelConfigService;
 import com.czg.market.service.MkShopCouponRecordService;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderInfoService;
@@ -56,6 +58,8 @@ public class AShopUserServiceImpl implements AShopUserService {
     private MkShopCouponRecordService couponRecordService;
     @Resource
     private ShopInfoService shopInfoService;
+    @DubboReference
+    private MemberLevelConfigService memberLevelConfigService;
 
     private ShopUser getUserInfo(Long shopUserId) {
         ShopUser shopUser = shopUserService.queryChain().eq(ShopUser::getId, shopUserId).one();
@@ -133,6 +137,8 @@ public class AShopUserServiceImpl implements AShopUserService {
         ShopUserDTO shopUserDTO = BeanUtil.copyProperties(shopUser, ShopUserDTO.class);
         shopUserDTO.setCouponNum(count);
         shopUserDTO.setOrderNumber(orderInfoService.count(new QueryWrapper().eq(OrderInfo::getUserId, userId).eq(OrderInfo::getShopId, StpKit.USER.getShopId(0L)).eq(OrderInfo::getStatus, "done")));
+        MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUser.getMemberLevelId());
+        shopUserDTO.setMemberLevelName(memberLevelConfig == null ? null : memberLevelConfig.getName());
         return shopUserDTO;
     }
 
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
index fb0ecdbe..f79b561e 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -59,9 +59,11 @@
         a.*,
         IFNULL(c.couponNum, 0) AS couponNum,
         IFNULL(d.orderNumber, 0) AS orderNumber,
-        IFNULL(f.rechargeAmount, 0) AS rechargeAmount
+        IFNULL(f.rechargeAmount, 0) AS rechargeAmount,
+        c.name as memberLevelName
         FROM tb_shop_user a
         LEFT JOIN tb_user_info b ON b.id = a.user_id
+        LEFT JOIN tb_member_level_config c on c.id=a.member_level_id
 
         -- 预计算优惠券数量
         LEFT JOIN (
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberLevelConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberLevelConfigServiceImpl.java
index 47256b85..8b7dc092 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberLevelConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberLevelConfigServiceImpl.java
@@ -12,6 +12,8 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.market.entity.MemberLevelConfig;
 import com.czg.market.service.MemberLevelConfigService;
 import jakarta.annotation.Resource;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -23,7 +25,7 @@ import java.util.List;
  * @author zs
  * @since 2025-09-10
  */
-@Service
+@DubboService
 public class TbMemberLevelConfigServiceImpl extends ServiceImpl<TbMemberLevelConfigMapper, MemberLevelConfig> implements MemberLevelConfigService{
     @Resource
     private ShopCouponService shopCouponService;