Merge remote-tracking branch 'origin/dev' into dev

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<CuMemberRetailDataStatisticsDetailVO> 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())
+//            );
         });
     }
 

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,