huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1048 【功能修复】处理统计可能导致的空指针问题

Browse Source 
Merge pull request !1048 from 卢越/master-jdk17
This commit is contained in:
芋道源码 2024-08-21 13:47:15 +00:00 committed by Gitee
commit d6e491937c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
View File

@ -69,9 +69,18 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
bo -> AreaUtils.getParentIdByType(bo.getAreaId(), AreaTypeEnum.PROVINCE), bo -> AreaUtils.getParentIdByType(bo.getAreaId(), AreaTypeEnum.PROVINCE),
bo -> bo, bo -> bo,
(a, b) -> new MemberAreaStatisticsRespBO() (a, b) -> new MemberAreaStatisticsRespBO()
.setOrderCreateUserCount(a.getOrderCreateUserCount() + b.getOrderCreateUserCount()) .setOrderCreateUserCount(
.setOrderPayUserCount(a.getOrderPayUserCount() + b.getOrderPayUserCount()) (a.getOrderCreateUserCount() != null ? a.getOrderCreateUserCount() : 0) +
.setOrderPayPrice(a.getOrderPayPrice() + b.getOrderPayPrice())); (b.getOrderCreateUserCount() != null ? b.getOrderCreateUserCount() : 0)
)
.setOrderPayUserCount(
(a.getOrderPayUserCount() != null ? a.getOrderPayUserCount() : 0) +
(b.getOrderPayUserCount() != null ? b.getOrderPayUserCount() : 0)
)
.setOrderPayPrice(
(a.getOrderPayPrice() != null ? a.getOrderPayPrice() : 0.0) +
(b.getOrderPayPrice() != null ? b.getOrderPayPrice() : 0.0)
)
// 拼接数据 // 拼接数据
List<Area> areaList = AreaUtils.getByType(AreaTypeEnum.PROVINCE, area -> area); List<Area> areaList = AreaUtils.getByType(AreaTypeEnum.PROVINCE, area -> area);
areaList.add(new Area().setId(null).setName("未知")); areaList.add(new Area().setId(null).setName("未知"));