From 98db120f1fc4832c2fb34a94c0d30622d41b2568 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 29 Oct 2025 15:07:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/market/dto/MkDistributionUserDTO.java | 4 ++++
 .../main/java/com/czg/market/entity/MkDistributionUser.java | 5 +++++
 .../market/service/impl/MkDistributionUserServiceImpl.java  | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
index cdfb3acc..d35364fd 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
@@ -84,6 +84,10 @@ public class MkDistributionUserDTO extends TimeQueryParam implements Serializabl
      * 邀请人数
      */
     private Integer inviteCount;
+    /**
+     * 已消费金额
+     */
+    private BigDecimal consumeAmount;
 
     /**
      * 如：自主申请、付费开通、手动添加
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java
index d045d4f1..4877af48 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java
@@ -89,6 +89,11 @@ public class MkDistributionUser implements Serializable {
      */
     private Integer inviteCount;
 
+    /**
+     * 已消费金额
+     */
+    private BigDecimal consumeAmount;
+
     /**
      * 如：自主申请、付费开通、手动添加
      */
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 6a323594..b4a8b6b9 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
@@ -332,15 +332,17 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 .le(MkDistributionLevelConfig::getCostAmount, totalAmount)
                 .gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId())
                 .orderBy(MkDistributionLevelConfig::getId).asc().limit(1));
+        MkDistributionUser newDistributionUser = new MkDistributionUser();
+        newDistributionUser.setId(shopUserId);
+        newDistributionUser.setConsumeAmount(totalAmount);
         if (levelConfig != null) {
             if (totalAmount.compareTo(levelConfig.getCostAmount()) >= 0) {
-                MkDistributionUser newDistributionUser = new MkDistributionUser();
                 newDistributionUser.setId(shopUserId);
                 newDistributionUser.setDistributionLevelId(levelConfig.getId());
                 newDistributionUser.setDistributionLevelName(levelConfig.getName());
-                updateById(newDistributionUser);
             }
         }
+        updateById(newDistributionUser);
 
     }