From 21a40b8ddb67d6808349cebb99bafe5d218bc8f5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 11 Nov 2025 15:23:39 +0800
Subject: [PATCH] =?UTF-8?q?shop=5Fuser=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/order/param/DataSummaryTradeParam.java  | 4 ++++
 .../service/impl/ShopOrderStatisticServiceImpl.java      | 9 +++++++++
 .../main/resources/mapper/ShopOrderStatisticMapper.xml   | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
index a9099adfc..6386984c3 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
@@ -33,5 +33,9 @@ public class DataSummaryTradeParam implements Serializable {
      * 店铺id
      */
     private Long shopId;
+     /**
+      * 主店id
+      */
+    private Long mainShopId;
 
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
index 959092d6d..7ec43c692 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
@@ -3,6 +3,8 @@ package com.czg.service.order.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.czg.account.entity.ShopInfo;
+import com.czg.account.service.ShopInfoService;
 import com.czg.order.entity.ShopOrderStatistic;
 import com.czg.order.param.DataSummaryTradeParam;
 import com.czg.order.service.DataSummaryService;
@@ -11,6 +13,7 @@ import com.czg.service.order.mapper.ShopOrderStatisticMapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -28,6 +31,10 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
     @Resource
     private DataSummaryService dataSummaryService;
 
+    @DubboReference
+    private ShopInfoService shopInfoService;
+
+
 
     @Override
     public void statistic(DateTime dateTime) {
@@ -42,8 +49,10 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         List<List<Long>> split = CollUtil.split(shopIdList, 5);
         for (List<Long> splitIdList : split) {
             splitIdList.parallelStream().forEach(shopId -> {
+                Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
                 DataSummaryTradeParam param = new DataSummaryTradeParam();
                 param.setShopId(shopId);
+                param.setMainShopId(mainShopId);
                 param.setBeginDate(startOfDay.toStringDefaultTimeZone());
                 param.setEndDate(endOfDay.toStringDefaultTimeZone());
                 ShopOrderStatistic statistic = dataSummaryService.getRealTimeTradeData(param);
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
index d4bc2f55f..83749ccc7 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
@@ -41,7 +41,7 @@
         group by shop_id
     </select>
     <select id="getNewMemberCount" resultType="java.lang.Long">
-        select count(1) from tb_shop_user where shop_id = #{shopId} and is_vip = 1
+        select count(1) from tb_shop_user where main_shop_id = #{mainShopId} and is_vip = 1
         <if test="beginDate != null and beginDate != ''">
             and join_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
         </if>