From f662c9f458dba3c649a2b36e1bf7bdaf447db9e3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 29 Oct 2025 15:39:05 +0800
Subject: [PATCH] =?UTF-8?q?dubbo=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MkCouponRedemptionConfigMapper.java |  2 +-
 .../mapper/MkDistributionUserMapper.java       |  5 +++++
 .../impl/MkDistributionUserServiceImpl.java    | 18 +++---------------
 .../mapper/MkDistributionUserMapper.xml        | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkCouponRedemptionConfigMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkCouponRedemptionConfigMapper.java
index a122173e..08a07279 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkCouponRedemptionConfigMapper.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkCouponRedemptionConfigMapper.java
@@ -1,7 +1,7 @@
 package com.czg.service.market.mapper;
 
-import com.mybatisflex.core.BaseMapper;
 import com.czg.market.entity.MkRedemptionConfig;
+import com.mybatisflex.core.BaseMapper;
 
 /**
  * 充值优惠券修改 映射层。
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java
index 7a063d0a..b068e47f 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java
@@ -25,4 +25,9 @@ public interface MkDistributionUserMapper extends BaseMapper<MkDistributionUser>
     List<DistributionCenterShopVO> selectUnDistributionShops(Long userId);
 
     boolean updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id);
+
+    /**
+     * 统计消费金额
+     */
+    BigDecimal getOrderConsumeAmountByList(Long shopId, List<Long> userIds,Long userId);
 }
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 fad56cc3..778134d0 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
@@ -325,11 +325,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 .select(ShopUser::getUserId)
                 .eq(ShopUser::getDistributionUserId, shopUserId), Long.class);
         userIds.add(distributionUser.getUserId());
-        BigDecimal totalAmount = orderInfoService.getOneAs(QueryWrapper.create()
-                .select("sum(pay_amount)")
-                .eq(OrderInfo::getShopId, shopId)
-                .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
-                .in(OrderInfo::getUserId, userIds), BigDecimal.class);
+        BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(shopId, userIds, null);
         MkDistributionLevelConfig levelConfig = levelConfigService.getOne(QueryWrapper.create()
                 .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId())
                 .le(MkDistributionLevelConfig::getCostAmount, totalAmount)
@@ -418,11 +414,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         param.setId(param.getId());
         param.setUserId(shopUser.getUserId());
         param.setInviteCode(CzgRandomUtils.randomString(10));
-        BigDecimal totalAmount = orderInfoService.getOneAs(QueryWrapper.create()
-                .select("sum(pay_amount)")
-                .eq(OrderInfo::getShopId, param.getShopId())
-                .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
-                .eq(OrderInfo::getUserId, param.getUserId()), BigDecimal.class);
+        BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(param.getShopId(), null, param.getUserId());
         param.setConsumeAmount(totalAmount);
         save(param);
         ShopUser shopUser2 = new ShopUser();
@@ -465,11 +457,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                     .select(ShopUser::getUserId)
                     .eq(ShopUser::getDistributionUserId, distributionUser.getId()), Long.class);
             userIds.add(distributionUser.getUserId());
-            BigDecimal totalAmount = orderInfoService.getOneAs(QueryWrapper.create()
-                    .select("sum(pay_amount)")
-                    .eq(OrderInfo::getShopId, param.getShopId())
-                    .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
-                    .in(OrderInfo::getUserId, userIds), BigDecimal.class);
+            BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(param.getShopId(), userIds, null);
             levelConfig = levelConfigService.getOne(QueryWrapper.create()
                     .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId())
                     .le(MkDistributionLevelConfig::getCostAmount, totalAmount)
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 0412018a..ae456552 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
@@ -49,4 +49,22 @@
         GROUP BY shop.id
 
     </select>
+
+    <select id="getOrderConsumeAmountByList" resultType="java.math.BigDecimal">
+        select sum(pay_amount)
+        from tb_order_info
+        where shop_id = #{shopId}
+          and status = 'done'
+        <choose>
+            <when test="userId != null">
+                and user_id = #{userId}
+            </when>
+            <otherwise>
+                and user_id in
+                <foreach collection="userIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </otherwise>
+        </choose>
+    </select>
 </mapper>