From 5b1ce2f5827cb141d925731349948bdcc45ff567 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 15:00:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E9=94=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/constant/TableValueConstant.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java b/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java
index a7a532ea0..521db807b 100644
--- a/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java
@@ -83,8 +83,8 @@ public interface TableValueConstant {
         @Getter
         enum Status {
             PENDING("pending", "待入账"),
-            SUCCESS("sub", "已入账"),
-            SELF_RECHARGE("self_recharge", "自助充值"), FAIL("fail", "失败");
+            SUCCESS("success", "已入账"),
+            FAIL("fail", "失败");
             private final String code;
             private final String msg;
 

From bd36913fdcfbc747da408dd858aaafca9f8b3325 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 15:04:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkDistributionUserServiceImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 6a323594d..36df36d39 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
@@ -590,16 +590,17 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         } catch (Exception e) {
             flag = false;
         }
+        ShopUser shopUser = shopUserService.getById(distributionUser.getId());
 
         MkDistributionFlow mkDistributionFlow = new MkDistributionFlow().setShopUserId(distributionUser.getId())
                 .setShopId(distributionUser.getShopId()).setDistributionUserId(distributionUser.getId())
+                .setNickName(shopUser.getNickName())
                 .setLevelId(distributionUser.getDistributionLevelId()).setLevel(currentLevel == 1 ? 1 : 2).setSourceNickName(sourceShopUser.getNickName()).setOrderNo(orderNo)
                 .setSourceId(sourceId).setAmount(amount).setType(type).setStatus(flag ? TableValueConstant.DistributionFlow.Status.SUCCESS.getCode() :
                         TableValueConstant.DistributionFlow.Status.PENDING.getCode())
                 .setRewardAmount(rewardAmount).setBillNo(IdUtil.simpleUUID());
         distributionFlowService.save(mkDistributionFlow);
 
-        ShopUser shopUser = shopUserService.getById(distributionUser.getId());
         updateIncome(!flag ? rewardAmount : BigDecimal.ZERO,
                 flag ? rewardAmount : BigDecimal.ZERO, BigDecimal.ZERO, distributionUser.getId(), shopUser.getUserId());