From 1f8b2cba5053e8ad75d73ac5b73e3bcbb1dd7b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 27 Oct 2025 20:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=8F=90=E7=8E=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/user/UDistributionController.java   | 14 ++++++++++++++
 .../service/MkDistributionWithdrawFlowService.java |  2 ++
 .../MkDistributionWithdrawFlowServiceImpl.java     | 13 +++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
index f1f1606c..3b6a2273 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
@@ -3,6 +3,7 @@ package com.czg.controller.user;
 import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
 import com.czg.account.entity.UserInfo;
 import com.czg.market.dto.MkDistributionUserDTO;
+import com.czg.market.entity.MkDistributionWithdrawFlow;
 import com.czg.market.service.MkDistributionUserService;
 import com.czg.market.service.MkDistributionWithdrawFlowService;
 import com.czg.market.vo.DistributionCenterShopVO;
@@ -12,7 +13,9 @@ import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.utils.AssertUtil;
 import com.czg.service.market.service.impl.AppWxServiceImpl;
+import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -138,4 +141,15 @@ public class UDistributionController {
         return CzgResult.success(distributionUserService.withdrawDetail(StpKit.USER.getLoginIdAsLong(), shopId, id));
     }
 
+
+    /**
+     * 提现记录
+     * @param shopId
+     * @return
+     */
+    @GetMapping("/withdraw/flow")
+    public CzgResult<Page<MkDistributionWithdrawFlow>> withArdwFlow(@RequestParam Long shopId) {
+        return CzgResult.success(withdrawFlowService.pageInfo(StpKit.USER.getLoginIdAsLong(), shopId));
+    }
+
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java
index e20518c2..18763db1 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java
@@ -1,6 +1,7 @@
 package com.czg.market.service;
 
 import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.MkDistributionWithdrawFlow;
 
@@ -12,4 +13,5 @@ import com.czg.market.entity.MkDistributionWithdrawFlow;
  */
 public interface MkDistributionWithdrawFlowService extends IService<MkDistributionWithdrawFlow> {
 
+    Page<MkDistributionWithdrawFlow> pageInfo(long userId, Long shopId);
 }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java
index 1fd663b6..7689098a 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionWithdrawFlowServiceImpl.java
@@ -1,11 +1,17 @@
 package com.czg.service.market.service.impl;
 
+import com.czg.account.entity.ShopUser;
+import com.czg.account.service.ShopUserService;
 import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
+import com.czg.utils.PageUtil;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.market.entity.MkDistributionWithdrawFlow;
 import com.czg.market.service.MkDistributionWithdrawFlowService;
 import com.czg.service.market.mapper.MkDistributionWithdrawFlowMapper;
 import jakarta.annotation.Resource;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +22,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MkDistributionWithdrawFlowServiceImpl extends ServiceImpl<MkDistributionWithdrawFlowMapper, MkDistributionWithdrawFlow> implements MkDistributionWithdrawFlowService{
+    @DubboReference
+    private ShopUserService shopUserService;
 
+    @Override
+    public Page<MkDistributionWithdrawFlow> pageInfo(long userId, Long shopId) {
+        ShopUser shopUserInfo = shopUserService.getShopUserInfo(shopId, userId);
+        return page(PageUtil.buildPage(), new QueryWrapper().eq(MkDistributionWithdrawFlow::getShopUserId, shopUserInfo.getId()));
+    }
 }