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> split = CollUtil.split(shopIdList, 5); for (List 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