Merge remote-tracking branch 'origin/master'

YunaiV · Feb 17, 2024 · 08c2594 · 08c2594
2 parents fb66b27 + 24b0b16
commit 08c2594
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...n/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java b/...n/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.statistics.service.member;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.ip.core.Area;
 import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
@@ -71,7 +72,7 @@ public List<MemberAreaStatisticsRespVO> getMemberAreaStatisticsList() {
                 (a, b) -> new MemberAreaStatisticsRespBO()
                         .setOrderCreateUserCount(a.getOrderCreateUserCount() + b.getOrderCreateUserCount())
                         .setOrderPayUserCount(a.getOrderPayUserCount() + b.getOrderPayUserCount())
-                        .setOrderPayPrice(a.getOrderPayPrice() + b.getOrderPayPrice()));
+                        .setOrderPayPrice(ObjUtil.defaultIfNull(a.getOrderPayPrice(), 0) + ObjUtil.defaultIfNull(b.getOrderPayPrice(), 0)));
         // 拼接数据
         List<Area> areaList = AreaUtils.getByType(AreaTypeEnum.PROVINCE, area -> area);
         areaList.add(new Area().setId(null).setName("未知"));