From 655b545bdb0a53ad710667003291f21106797acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 28 Oct 2025 17:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/NotifyController.java  |  3 +-
 .../account/mapper/UserInfoMapper.java        |  2 +-
 .../service/impl/UserInfoServiceImpl.java     |  4 +--
 .../main/resources/mapper/UserInfoMapper.xml  |  2 +-
 .../impl/MkDistributionUserServiceImpl.java   | 30 ++++++++++++-------
 .../mapper/MkDistributionUserMapper.xml       |  8 ++++-
 6 files changed, 32 insertions(+), 17 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 8f2dd93c..e6eb827a 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
@@ -56,7 +56,8 @@ public class NotifyController {
 
     @GetMapping("testOpen")
     public Map<String, String> test1(String code) throws Exception {
-        return wxService.v3Pay("oeQYq5LzW-kSxJL9TR4s_UmOmNLE", new BigDecimal("0.01"), "测试", "testZs" + RandomUtil.randomNumbers(20), "distributionRecharge");
+        distributionUserService.distribute(54458L, "WX1980104754310836224", BigDecimal.valueOf(18), 36434L, 122L, "order");
+        return null;
     }
 
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java
index 9d29c998..4a96d6a1 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java
@@ -14,5 +14,5 @@ import java.math.BigDecimal;
  */
 public interface UserInfoMapper extends BaseMapper<UserInfo> {
 
-    boolean updateAmount(long userId, BigDecimal amount);
+    int updateAmount(long userId, BigDecimal amount);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
index 3867b605..62be361a 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java
@@ -102,8 +102,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
 
     @Override
     public void updateDistributionAmount(long userId, BigDecimal amount) {
-        boolean b = mapper.updateAmount(userId, amount);
-        if (!b) {
+        int b = mapper.updateAmount(userId, amount);
+        if (b <= 0) {
             throw new CzgException("更新分销金额失败");
         }
     }
diff --git a/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml b/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml
index 06b522ad..22610f3b 100644
--- a/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.czg.service.account.mapper.UserInfoMapper">
 
     <update id="updateAmount">
-        update tb_user_info set distribution_amount = distribution_amount + #{amount} where id = #{id}
+        update tb_user_info set distribution_amount = distribution_amount + #{amount} where id = #{userId}
         and distribution_amount + #{amount} >= 0
     </update>
 </mapper>
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 5ae00679..c5650905 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
@@ -494,6 +494,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
 
 
     private void deepReward(MkDistributionConfigVO config, ShopUser sourceShopUser, BigDecimal amount, Long sourceId, String type, String orderNo, Integer currentLevel) {
+        if (currentLevel > 2) {
+            return;
+        }
         MkDistributionUser distributionUser = getOne(new QueryWrapper().eq(MkDistributionUser::getId, sourceShopUser.getId()));
         AssertUtil.isNull(distributionUser, "分销员不存在");
         AssertUtil.isTrue(distributionUser.getStatus() != 1, "分销员未开启");
@@ -526,16 +529,17 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
 
         // 店铺信息
         BigDecimal rewardAmount;
-        if (currentLevel == 1) {
-            rewardAmount = amount.multiply(level.getLevelOneCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
-        } else {
-            rewardAmount = amount.multiply(level.getLevelTwoCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
-        }
+//        if (currentLevel == 1) {
+//            rewardAmount = amount.multiply(level.getLevelOneCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
+//        } else {
+//            rewardAmount = amount.multiply(level.getLevelTwoCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
+//        }
+        rewardAmount = amount.multiply(level.getLevelTwoCommission().divide(BigDecimal.valueOf(100), RoundingMode.DOWN));
 
         boolean flag = true;
         BigDecimal finalAmount = BigDecimal.ZERO;
         try {
-            shopInfoService.updateAmount(distributionUser.getShopId(), rewardAmount.negate());
+            finalAmount = shopInfoService.updateAmount(distributionUser.getShopId(), rewardAmount.negate());
         } catch (Exception e) {
             flag = false;
         }
@@ -554,9 +558,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
 
         if (flag) {
             distributionAmountFlowService.save(new MkDistributionAmountFlow()
-                    .setType(TableValueConstant.DistributionAmountFlow.Type.SELF_RECHARGE.getCode())
-                    .setShopId(config.getShopId()).setAmount(finalAmount).setChangeAmount(amount).setSourceId(mkDistributionFlow.getId())
-                    .setRemark("自助充值").setOpAccount(StpKit.USER.getAccount()));
+                    .setType(TableValueConstant.DistributionAmountFlow.Type.SUB.getCode())
+                    .setShopId(config.getShopId()).setAmount(finalAmount).setChangeAmount(rewardAmount).setSourceId(mkDistributionFlow.getId())
+                    .setRemark("分账扣除"));
         }
 
     }
@@ -574,14 +578,18 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 return;
             }
 
-            deepReward(config, sourceShopUserInfo, amount, sourceId, type, orderNo, 1);
-        }, "分销方法执行失败");
+            ShopUser parentUserInfo = shopUserService.getById(sourceShopUserInfo.getDistributionUserId());
+            deepReward(config, parentUserInfo, amount, sourceId, type, orderNo, 1);
+        });
     }
 
     @Override
     public void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId) {
         userInfoService.updateDistributionAmount(userId, receivedIncome);
         boolean flag = mapper.updateIncome(pendingIncome, receivedIncome, withdrawIncome, id);
+        if (!flag) {
+            throw new CzgException("操作失败");
+        }
     }
 
     @Override
diff --git a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
index 44b076a5..0412018a 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
@@ -5,7 +5,13 @@
 <mapper namespace="com.czg.service.market.mapper.MkDistributionUserMapper">
     <update id="updateIncome">
         update mk_distribution_user
-        set total_income = total_income + #{pendingIncome},
+        set
+            <if test="pendingIncome != null">
+                total_income = total_income + #{pendingIncome},
+            </if>
+            <if test="receivedIncome != null">
+                total_income = total_income + #{receivedIncome},
+            </if>
             pending_income = pending_income + #{pendingIncome},
             received_income = received_income + #{receivedIncome},
             withdrawn_income = withdrawn_income + #{withdrawIncome}