From e34558995601bceffb6ba99ea0b92d2f50295402 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, 30 Oct 2025 14:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/market/mapper/MkDistributionFlowMapper.java | 4 ++--
 .../market/service/impl/MkDistributionFlowServiceImpl.java  | 6 +++---
 .../src/main/resources/mapper/MkDistributionFlowMapper.xml  | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java
index 041bbd56..e38adde7 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionFlowMapper.java
@@ -17,6 +17,6 @@ import java.util.List;
  */
 public interface MkDistributionFlowMapper extends BaseMapper<MkDistributionFlow> {
 
-    List<MkDistributionFlowVO> pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type);
-    BigDecimal totalAmount(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type);
+    List<MkDistributionFlowVO> pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type, Long userId);
+    BigDecimal totalAmount(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String status, String key, Long id, String type, Long userId);
 }
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 463761de..8c9baf7d 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
@@ -45,7 +45,7 @@ public class MkDistributionFlowServiceImpl extends ServiceImpl<MkDistributionFlo
     @Override
     public Map<String, Object> pageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key, String status, Long id) {
         PageHelper.startPage(PageUtil.buildPageHelp());
-        List<MkDistributionFlowVO> list = mapper.pageInfo(shopId, startTime, endTime, status, key, id, null);
+        List<MkDistributionFlowVO> list = mapper.pageInfo(shopId, startTime, endTime, status, key, id, null, null);
         Page<MkDistributionFlowVO> page = PageUtil.convert(new PageInfo<>(list));
         Map<String, Object> map = BeanUtil.beanToMap(page);
         map.put("successAmount", getOneAs(new QueryWrapper().eq(MkDistributionFlow::getShopId, shopId)
@@ -66,11 +66,11 @@ public class MkDistributionFlowServiceImpl extends ServiceImpl<MkDistributionFlo
         }
         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, shopUserInfo == null ? null : shopUserInfo.getId(), null);
+                StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo == null ? null : shopUserInfo.getId(), null, userId);
         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, shopUserInfo == null ? null : shopUserInfo.getId(), null));
+                StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), status,null, shopUserInfo == null ? null : shopUserInfo.getId(), null, userId));
         return map;
     }
 }
diff --git a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml
index cd9b27a1..86cdd704 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml
@@ -35,6 +35,9 @@
             <if test="id != null">
                 and d.id=#{id}
             </if>
+            <if test="userId != null">
+                and d.user_id=#{userId}
+            </if>
             <if test="type != null and type != ''">
                 and a.type=#{type}
             </if>
@@ -70,5 +73,8 @@
         <if test="type != null and type != ''">
             and a.type=#{type}
         </if>
+        <if test="userId != null">
+            and d.user_id=#{userId}
+        </if>
     </select>
 </mapper>