From 37a2aa60619ec64b73c779d66478b38bf1c439e6 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, 13 Nov 2025 16:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=9D=E5=AD=98=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/account/entity/ShopUser.java        | 2 ++
 .../src/main/java/com/czg/market/vo/MemberDetailVO.java       | 2 ++
 .../market/service/impl/TbMemberConfigServiceImpl.java        | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java
index f1cd9ada3..832027941 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java
@@ -152,6 +152,8 @@ public class ShopUser implements Serializable {
     private LocalDateTime nextDeliverTime;
     // 是否分销员
     private String distributionShops;
+    private String memberCircleName;
+    private Integer memberCircleReward;
 
     @Column(ignore = true)
     private String memberName;
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java
index 17f6fc225..49606a2cc 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java
@@ -34,4 +34,6 @@ public class MemberDetailVO implements Serializable {
     private LocalDateTime endTime;
 
     private String memberName;
+    private String memberCircleName;
+    private Integer memberCircleReward;
 }
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 ad9d604e4..f83b6f550 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
@@ -524,6 +524,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) {
             shopUser.setMemberLevelId(levelConfig.getId());
         }
+        shopUser.setMemberCircleName(memberOrder.getName());
+        shopUser.setMemberCircleReward(memberOrder.getReward());
         shopUser.setIsVip(1);
         shopUser.setOpenType("PAY");
         if (memberOrder.getReward() != null) {
@@ -574,6 +576,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         MemberLevelConfig nextLevel = levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopId).ge(MemberLevelConfig::getExperienceValue, shopUser.getExperience())
                 .ne(MemberLevelConfig::getId, shopUser.getMemberLevelId()).orderBy(MemberLevelConfig::getExperienceValue, true));
         return new MemberDetailVO()
+                .setMemberCircleName(shopUser.getMemberCircleName())
+                .setMemberCircleReward(shopUser.getMemberCircleReward())
                 .setMemberName(shopUser.getMemberName())
                 .setShopInfo(shopInfo)
                 .setMemberLevel(levelVO)