From 82d675a2c538653bcab76c30bd1fae0d7b3ad8a0 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 11:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E5=91=98=E5=BC=80=E9=80=9A?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/controller/NotifyController.java    | 4 ++--
 .../com/czg/market/service/MkDistributionUserService.java     | 4 ++--
 .../market/service/impl/MkDistributionUserServiceImpl.java    | 4 ++--
 .../src/main/resources/mapper/MkDistributionFlowMapper.xml    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
index fc89ec59..949853a9 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -57,8 +57,8 @@ public class NotifyController {
 
     @GetMapping("testOpen")
     public JSONObject test1(String code) throws Exception {
-        JSONObject jsonObject = wxService.transferBalance("or1l86yipGvwyfPhrKIAcQuSfAV8", "叶明飞", new BigDecimal("0.01"), "转账测试", "testTranymf0001");
-        return jsonObject;
+        distributionUserService.distribute(54659L, "WX1983728389726539776", BigDecimal.valueOf(1), 474L, 122L, "order");
+        return null;
     }
 
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
index c3d5aecb..95d61fd9 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
@@ -103,11 +103,11 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
     /**
      * 分销员开通
      *
-     * @param userId 用户
+     * @param shopUserId 用户
      * @param amount 金额
      * @param shopId 店铺id
      */
-    void open(Long userId, BigDecimal amount, Long shopId, Long sourceId);
+    void open(Long shopUserId, BigDecimal amount, Long shopId, Long sourceId);
 
     /**
      * 分销商户运营余额充值回调
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 6a43269f..3c9783f1 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
@@ -533,8 +533,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
     }
 
     @Override
-    public void open(Long userId, BigDecimal amount, Long shopId, Long sourceId) {
-        ShopUser shopUserInfo = shopUserService.getShopUserInfo(shopId, userId);
+    public void open(Long shopUserId, BigDecimal amount, Long shopId, Long sourceId) {
+        ShopUser shopUserInfo = shopUserService.getById(shopUserId);
         Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
         BigDecimal finalAmount = shopInfoService.updateAmount(shopId, amount);
         distributionAmountFlowService.save(new MkDistributionAmountFlow()
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 c7c6349f..cd9b27a1 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml
@@ -9,7 +9,7 @@
         left join mk_distribution_user as d on d.id=a.distribution_user_id
         left join tb_shop_info as e on e.id=a.shop_id
         left join tb_shop_user as b on a.shop_user_id=b.id
-        left join tb_shop_user as c on c.id=a.shop_user_id
+        left join tb_shop_user as c on c.id=a.source_shop_user_id
         <where>
             <if test="shopId != null">
                 and a.shop_id=#{shopId}