From 1f1bd65bb15ac5f62473c684469ce270469c7b90 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 29 Oct 2025 18:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=20=E5=8F=AF=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkDistributionUserServiceImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
index 6a7f337f..56143af9 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
@@ -162,6 +162,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         result.put("parentPhone", "");
         ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
         AssertUtil.isNull(shopUser, "店铺用户不存在");
+        UserInfo userInfo = userInfoService.getById(shopUser.getId());
+        result.put("cashOutAmount", userInfo.getDistributionAmount() == null ? 0.0 : userInfo.getDistributionAmount());
         if (shopUser.getDistributionUserId() != null) {
             MkDistributionUser mkDistributionUser = this.getById(shopUser.getDistributionUserId());
             AssertUtil.isNull(mkDistributionUser, "上级分销员不存在");
@@ -180,6 +182,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
             distributionUser.put("status", mkDistributionUser.getStatus() == 9);
             distributionUser.put("totalIncome", mkDistributionUser.getTotalIncome());
             distributionUser.put("pendingIncome", mkDistributionUser.getPendingIncome());
+
             if (mkDistributionUser.getDistributionLevelId() != null) {
                 List<MkDistributionLevelConfig> levelConfigList = mkDistributionConfigVO.getLevelConfigList();
                 boolean isNextLevel = false;
@@ -274,10 +277,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         newShopUser.setDistributionUserParentId(parent.getParentId());
         newShopUser.setInviteTime(LocalDateTime.now());
         shopUserService.updateById(newShopUser);
-        if (parent.getParentId() != null) {
+        if (parentShopUser.getDistributionUserParentId() != null) {
             //更新自己的下级 的上级的上级 为自己的上级
             ShopUser childShopUser = new ShopUser();
-            childShopUser.setDistributionUserParentId(parent.getParentId());
+            childShopUser.setDistributionUserParentId(parentShopUser.getDistributionUserParentId());
             shopUserService.update(childShopUser, QueryWrapper.create().eq(ShopUser::getDistributionUserId, shopUser.getId()));
         }