From 306e14b299b3aa16ddfdd95435bbe24d8a76d06b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 29 Oct 2025 18:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=20Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/market/dto/MkDistributionUserDTO.java     | 5 -----
 .../java/com/czg/market/entity/MkDistributionUser.java     | 5 -----
 .../market/service/impl/MkDistributionUserServiceImpl.java | 7 +++----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
index d35364fd2..8c8efe714 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
@@ -35,11 +35,6 @@ public class MkDistributionUserDTO extends TimeQueryParam implements Serializabl
      */
     private Long id;
 
-    /**
-     * 上级ID 关联本表id字段，无上级时为NULL
-     */
-    private Long parentId;
-
     /**
      * 店铺id
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java
index 4877af481..2778dfd4a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java
@@ -37,11 +37,6 @@ public class MkDistributionUser implements Serializable {
     @Id
     private Long id;
 
-    /**
-     * 上级ID 关联本表id字段，无上级时为NULL
-     */
-    private Long parentId;
-
     /**
      * 店铺id
      */
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 b0b49cb3d..f06370bf9 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
@@ -275,8 +275,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         //更新自己的上级
         ShopUser newShopUser = new ShopUser();
         newShopUser.setId(shopUser.getId());
-        newShopUser.setDistributionUserId(parent.getId());
-        newShopUser.setDistributionUserParentId(parent.getParentId());
+        newShopUser.setDistributionUserId(parentShopUser.getId());
+        newShopUser.setDistributionUserParentId(parentShopUser.getDistributionUserId());
         newShopUser.setInviteTime(LocalDateTime.now());
         shopUserService.updateById(newShopUser);
         if (parentShopUser.getDistributionUserParentId() != null) {
@@ -369,7 +369,6 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq(MkDistributionUser::getId, param.getId());
         queryWrapper.eq(MkDistributionUser::getShopId, param.getShopId());
-        queryWrapper.eq(MkDistributionUser::getParentId, param.getParentId());
         queryWrapper.eq(MkDistributionUser::getDistributionLevelId, param.getDistributionLevelId());
         queryWrapper.ge(MkDistributionUser::getCreateTime, param.getStartTime());
         queryWrapper.le(MkDistributionUser::getCreateTime, param.getEndTime());
@@ -539,7 +538,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 .setType(TableValueConstant.DistributionAmountFlow.Type.OPEN.getCode())
                 .setMainShopId(mainShopId).setShopId(shopId).setAmount(finalAmount).setChangeAmount(amount).setSourceId(sourceId)
                 .setRemark("分销员购买"));
-        addDistributionUser(new MkDistributionUser().setParentId(null).setShopId(shopId)
+        addDistributionUser(new MkDistributionUser().setShopId(shopId)
                 .setUserId(shopUserInfo.getUserId())
                 .setId(shopUserInfo.getId()).setOpeningMethod("付费开通"));
     }