From 3995b951485b7dbb1ce2f8d32060f894e78861fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 29 Oct 2025 19:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/entity/MkDistributionFlow.java    |  2 ++
 .../service/impl/MkDistributionUserServiceImpl.java  | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java
index ca4767479..e5a3bccf4 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java
@@ -109,5 +109,7 @@ public class MkDistributionFlow implements Serializable {
     private Long sourceShopUserId;
 
     private String nickName;
+    private Long sourceDistributionUserId;
+    private LocalDateTime deliverTime;
 
 }
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 80257fcac..f0ffee519 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
@@ -2,6 +2,7 @@ package com.czg.service.market.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
@@ -555,7 +556,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     }
 
 
-    private void deepReward(MkDistributionConfigVO config, ShopUser sourceShopUser, BigDecimal amount, Long sourceId, String type, String orderNo, Integer currentLevel) {
+    private void deepReward(ShopUser orderSourceShopUser, MkDistributionConfigVO config, ShopUser sourceShopUser, BigDecimal amount, Long sourceId, String type, String orderNo, Integer currentLevel) {
         if (currentLevel > 2) {
             return;
         }
@@ -571,7 +572,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 return;
             }
             try {
-                deepReward(config, shopUserService.getById(parent.getId()), amount, sourceId, type, orderNo, ++currentLevel);
+                deepReward(orderSourceShopUser, config, shopUserService.getById(parent.getId()), amount, sourceId, type, orderNo, ++currentLevel);
             } catch (Exception e) {
                 log.warn("分销奖励失败: {}", e.getMessage());
             }
@@ -610,8 +611,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
 
         MkDistributionFlow mkDistributionFlow = new MkDistributionFlow().setShopUserId(distributionUser.getId())
                 .setShopId(distributionUser.getShopId()).setDistributionUserId(distributionUser.getId())
-                .setNickName(shopUser.getNickName()).setSourceShopUserId(sourceShopUser.getId())
-                .setLevelId(distributionUser.getDistributionLevelId()).setLevel(currentLevel == 1 ? 1 : 2).setSourceNickName(sourceShopUser.getNickName()).setOrderNo(orderNo)
+                .setNickName(shopUser.getNickName()).setSourceShopUserId(orderSourceShopUser.getId()).setSourceNickName(orderSourceShopUser.getNickName())
+                .setSourceDistributionUserId(orderSourceShopUser.getId()).setDeliverTime(config.getSettlementDay() == 0 ? null : DateUtil.offsetDay(DateUtil.date(), config.getSettlementDay()).toLocalDateTime())
+                .setLevelId(distributionUser.getDistributionLevelId()).setLevel(currentLevel == 1 ? 1 : 2).setOrderNo(orderNo)
                 .setSourceId(sourceId).setAmount(amount).setType(type).setStatus(flag ? TableValueConstant.DistributionFlow.Status.SUCCESS.getCode() :
                         TableValueConstant.DistributionFlow.Status.PENDING.getCode())
                 .setRewardAmount(rewardAmount).setBillNo(IdUtil.simpleUUID());
@@ -644,7 +646,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
             log.info("开始分销, 当前来源用户: {}, shopId: {}, 邀请人id: {}", sourceUserId, shopId, sourceShopUserInfo.getDistributionUserId());
 
             ShopUser parentUserInfo = shopUserService.getById(sourceShopUserInfo.getDistributionUserId());
-            deepReward(config, parentUserInfo, amount, sourceId, type, orderNo, 1);
+            deepReward(sourceShopUserInfo, config, parentUserInfo, amount, sourceId, type, orderNo, 1);
         });
     }