From 5dfff401016bcc9947b0aca36aa43d297bfdbb41 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 9 Oct 2025 16:54:10 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=8A=A8=E6=80=81=E6=80=BB=E4=B8=9A=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CuMemberRetailAchieveServiceImpl.java     |  2 +-
 .../member/utils/DataStatisticsUtil.java      | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
index aa2b0ad3..4d21136f 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
@@ -348,7 +348,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         String memberSecondTable = getDayTableNameSpecial();
         //查询直推会员
         List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
-        pkMemberList.add(userId);
+//        pkMemberList.add(userId);
         CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder()
                 .memberRetailTable(memberRetailTable)
                 .memberRetailSTable(memberSecondTable)
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 2878886b..fc19173b 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
@@ -36,16 +36,19 @@ public class DataStatisticsUtil {
         Long pkId = cuMember.getPkId();
         // 非激活直接返0
         // 激活判断上一天的ENABLE_STATUS 0为正常 1为当天激活 不计算日结数据
-        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
-            return CuMemberRetailDataStatisticsResultVO.builder()
-                    .totalPv(BigDecimal.ZERO)
-                    .bigRangeTotalPv(BigDecimal.ZERO)
-                    .smallRangeTotalPv(BigDecimal.ZERO)
-                    .build();
-        }
+//        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
+//            return CuMemberRetailDataStatisticsResultVO.builder()
+//                    .totalPv(BigDecimal.ZERO)
+//                    .bigRangeTotalPv(BigDecimal.ZERO)
+//                    .smallRangeTotalPv(BigDecimal.ZERO)
+//                    .build();
+//        }
         calcDetailVOTotalField(detailVOList, pkId);
 //        addVirtualBranch(detailVOList, pkId);
-        CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
+//        CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
+        CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder()
+                    .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getConsumePv).reduce(BigDecimal.ZERO, BigDecimal::add))
+                    .build();
 //        if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) {
 //            // 昨日非激活 排除昨日日结表数据
 //            excludeDailySettlementData(detailVOList);