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

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java

@@ -55,7 +55,10 @@ public class DataStatisticsUtil {
 //        }
         CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         BigDecimal smallRangeTotalPv = BigDecimal.ZERO;
-        if(ObjectUtil.isNotEmpty(bigRangePv)){
+        if(ObjectUtil.isEmpty(bigRangePv)){
+            bigRangePv = CuMemberRetailDataStatisticsDetailVO.builder()
+                    .totalPv(BigDecimal.ZERO)
+                    .build();
             smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv());
             if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) {
                 smallRangeTotalPv = BigDecimal.ZERO;