From dbeef93af8e104ae52f5a8f6142a8db067029eb4 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:39:44 +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

---
 .../service/impl/MkDistributionFlowServiceImpl.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java
index b14b19964..19a6f0b4d 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionFlowServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopInfoService;
+import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
 import com.czg.market.entity.MkDistributionAmountFlow;
 import com.czg.market.vo.MkDistributionAmountFlowVO;
@@ -37,6 +38,8 @@ import java.util.Map;
 public class MkDistributionFlowServiceImpl extends ServiceImpl<MkDistributionFlowMapper, MkDistributionFlow> implements MkDistributionFlowService{
     @DubboReference
     private ShopInfoService shopInfoService;
+    @DubboReference
+    private ShopUserService shopUserService;
 
     @Override
     public Map<String, Object> pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key, String status, Long id) {
@@ -55,14 +58,15 @@ public class MkDistributionFlowServiceImpl extends ServiceImpl<MkDistributionFlo
     }
 
     @Override
-    public Map<String, Object> distributionFlow(long loginIdAsLong, String startTime, String endTime, Long shopId, String status) {
+    public Map<String, Object> distributionFlow(long userId, String startTime, String endTime, Long shopId, String status) {
+        ShopUser shopUserInfo = shopUserService.getShopUserInfo(shopId, userId);
         PageHelper.startPage(PageUtil.buildPageHelp());
         List<MkDistributionFlowVO> list = mapper.pageInfo(shopId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime),
-                StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, null, null);
+                StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo.getId(), null);
         Page<MkDistributionFlowVO> page = PageUtil.convert(new PageInfo<>(list));
         Map<String, Object> map = BeanUtil.beanToMap(page);
         map.put("totalAmount", mapper.totalAmount(shopId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime),
-                StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, null, null));
+                StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo.getId(), null));
         return map;
     }
 }