From 90ab61fc2d60b4a4544a955e67bff6aa9a9b9fdc Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Thu, 9 Oct 2025 17:17:48 +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 --- .../retail/member/utils/DataStatisticsUtil.java | 16 ++++++++-------- .../member/achieve/CuMemberRetailRangeMapper.xml | 2 +- 2 files changed, 9 insertions(+), 9 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 fc19173b..e4e6dcab 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 @@ -47,7 +47,7 @@ public class DataStatisticsUtil { // addVirtualBranch(detailVOList, pkId); // CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO total = CuMemberRetailDataStatisticsDetailVO.builder() - .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getConsumePv).reduce(BigDecimal.ZERO, BigDecimal::add)) + .totalPv(detailVOList.stream().map(CuMemberRetailDataStatisticsDetailVO::getTotalPv).reduce(BigDecimal.ZERO, BigDecimal::add)) .build(); // if (EYesNo.NO.getIntValue() == cuMember.getIsActivate()) { // // 昨日非激活 排除昨日日结表数据 @@ -72,17 +72,17 @@ 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.getTeamConsumePv() + detailVO.getConsumePv() + .add(detailVO.getTeamConsumePv()) .add(detailVO.getSNewConsumePv()) .add(detailVO.getSTeamNewPv()) ); +// detailVO.setTotalPv( +// detailVO.getTeamConsumePv() +// .add(detailVO.getSNewConsumePv()) +// .add(detailVO.getSTeamNewPv()) +// ); }); } 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 3e586aec..b6548be6 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 @@ -455,7 +455,7 @@ NVL( mr.CONSUME_PV, 0 ) consumePv, 0 newConsumePv, - NVL( mr.TEAM_CONSUME_PV, 0 ) + NVL( mr.CONSUME_PV, 0 ) teamConsumePv, + NVL( mr.TEAM_CONSUME_PV, 0 ) teamConsumePv, 0 teamNewPv, 0 sNewConsumePv,