From 96e3e9a68f52f59950e5f53ba8c904c37482729e 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, 23 Oct 2025 17:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/account/dto/shopuser/ShopUserDTO.java     |  2 ++
 .../account/service/impl/AShopUserServiceImpl.java    | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 f30edfa4f..5cf4c5bf9 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
@@ -25,4 +25,6 @@ public class ShopUserDTO extends ShopUser {
      */
     private BigDecimal rechargeAmount;
     private String memberLevelName;
+    private String nextMemberLevelName;
+    private Long nextExperience;
 }
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 086306a59..fa3548286 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
@@ -182,9 +182,18 @@ 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 = null;
         if (shopUser.getMemberLevelId() != null) {
-            MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUser.getMemberLevelId());
+            memberLevelConfig = memberLevelConfigService.getById(shopUser.getMemberLevelId());
             shopUserDTO.setMemberLevelName(memberLevelConfig == null ? null : memberLevelConfig.getName());
+
+        }
+        MemberLevelConfig config = memberLevelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, mainId)
+                .ge(MemberLevelConfig::getExperienceValue, memberLevelConfig == null ? null : memberLevelConfig.getExperienceValue())
+                .limit(1).orderBy(MemberLevelConfig::getExperienceValue, true));
+        if (config != null) {
+            shopUserDTO.setNextExperience(config.getExperienceValue() - (shopUser.getExperience() == null ? 0 : shopUser.getExperience()));
+            shopUserDTO.setNextMemberLevelName(config.getName());
         }
         return shopUserDTO;
     }