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); }