From d60a2f2be4e1ad81bcbd98d9212b2871db020bb4 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Sun, 28 Sep 2025 13:40:07 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=B8=82=E5=9C=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81-=E5=8F=96=E6=B6=88=E8=87=AA=E5=B7=B1=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=8C=BA&=E5=8F=96=E6=B6=88=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=9A=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/retail/member/utils/DataStatisticsUtil.java | 13 +++++++++---- 1 file changed, 9 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 00a4446a..07965a94 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 @@ -44,7 +44,7 @@ public class DataStatisticsUtil { .build(); } calcDetailVOTotalField(detailVOList, pkId); - addVirtualBranch(detailVOList, pkId); +// addVirtualBranch(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { // 昨日非激活 排除昨日日结表数据 @@ -69,9 +69,14 @@ public class DataStatisticsUtil { */ public static void calcDetailVOTotalField(List detailVOList, Long pkId) { detailVOList.forEach(detailVO -> { +// detailVO.setTotalPv( +// detailVO.getConsumePv() +// .add(detailVO.getTeamConsumePv()) +// .add(detailVO.getSNewConsumePv()) +// .add(detailVO.getSTeamNewPv()) +// ); detailVO.setTotalPv( - detailVO.getConsumePv() - .add(detailVO.getTeamConsumePv()) + detailVO.getTeamConsumePv() .add(detailVO.getSNewConsumePv()) .add(detailVO.getSTeamNewPv()) ); @@ -155,7 +160,7 @@ public class DataStatisticsUtil { private static CuMemberRetailDataStatisticsDetailVO getBigRangePVDetailVO(List detailVOList, Long pkId) { return detailVOList.stream() - .filter(vo -> !vo.getPkId().equals(pkId)) +// .filter(vo -> !vo.getPkId().equals(pkId)) .max(Comparator.comparing(CuMemberRetailDataStatisticsDetailVO::getTotalPv)) .orElse(null); }