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

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java

@@ -270,6 +270,11 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         if(ObjectUtil.isEmpty(memberAchieveList)){
             return null;
         }
+        for (CuMemberRetailAchieveVO cuMemberRetailAchieveVO : memberAchieveList) {
+            if(ObjectUtil.isEmpty(cuMemberRetailAchieveVO.getArealPv())){
+                cuMemberRetailAchieveVO.setArealPv(BigDecimal.ZERO);
+            }
+        }
         CuMemberRetailAchieveVO maxAchieveVO = memberAchieveList.stream().max(Comparator.comparing(CuMemberRetailAchieveVO::getArealPv)).get();
         //查询小区业绩
         BigDecimal smallAreaPv = memberAchieveList.stream().filter(achieveVO -> !achieveVO.getPkMember().equals(maxAchieveVO.getPkMember())).map(vo -> null == vo.getArealPv() ? BigDecimal.ZERO : vo.getArealPv()).reduce(BigDecimal.ZERO, BigDecimal::add);