From 2b0bf0de363ef983a787dde9e98e824ae6c6ffd4 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 9 Oct 2025 16:14:20 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=AA=E4=BA=BA=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/utils/DataStatisticsUtil.java      |  8 +++---
 .../achieve/CuMemberRetailRangeMapper.xml     | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
index 07965a94..2878886b 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
@@ -46,10 +46,10 @@ public class DataStatisticsUtil {
         calcDetailVOTotalField(detailVOList, pkId);
 //        addVirtualBranch(detailVOList, pkId);
         CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
-        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
-            // 昨日非激活 排除昨日日结表数据
-            excludeDailySettlementData(detailVOList);
-        }
+//        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
+//            // 昨日非激活 排除昨日日结表数据
+//            excludeDailySettlementData(detailVOList);
+//        }
         CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         BigDecimal smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv());
         if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
index 36e6684e..b1c05d45 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
@@ -447,6 +447,31 @@
 
     <select id="getRetailDataStatisticsDetail"
             resultType="com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO">
+        SELECT
+        cu.pk_id,
+        cu.MEMBER_CODE,
+        mr.ENABLE_STATUS,
+
+        0 consumePv,
+        0 newConsumePv,
+
+        NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv,
+        0 teamNewPv,
+
+        0 sNewConsumePv,
+        0 sTeamNewPv
+        FROM ${memberRetailTable} mr
+        left join cu_member cu on cu.PK_ID = mr.PK_MEMBER and mr.CATEGORY = 0
+        <where>
+            <if test="pkMemberList != null and pkMemberList.size > 0">
+                cu.pk_id in
+                <foreach collection="pkMemberList" item="pkMember" separator="," open="(" close=")">
+                    #{pkMember}
+                </foreach>
+            </if>
+        </where>
+
+<!-- 市场动态不需要显示自己，不需要显示秒结
         SELECT
             cu.pk_id,
             cu.MEMBER_CODE,
@@ -472,6 +497,7 @@
                 </foreach>
             </if>
         </where>
+        -->
     </select>
 
     <select id="getMarketDynamicsDetail" resultType="com.hzs.retail.member.vo.MarketDynamicsDetailVO">