fix

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -435,7 +435,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 	public void getNatureOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
 		List<NatureOrderDataDto> orderDataList = statisticsExportMapper.getGroupsOrderData(startDate, endDate);
 		orderDataList.forEach(data->{
-			BigDecimal money = data.getMoney();
+			BigDecimal money = Optional.ofNullable(data.getMoney()).orElse(BigDecimal.ZERO);
 			if (data.getType() == 1) {
 				groupsDataStatisticsView.setNatureMoney(money);
 				return;
@@ -451,11 +451,11 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 	}
 
 	public void getCategoryOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
-		BigDecimal natureStreamingMoney = statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(1, null, 2l, startDate, endDate);
+		BigDecimal natureStreamingMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(1, null, 2l, startDate, endDate)).orElse(BigDecimal.ZERO);
 		// AI销售金额
-		BigDecimal natureAiOrderMoney = statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(1, null, 1l, startDate, endDate);
+		BigDecimal natureAiOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(1, null, 1l, startDate, endDate)).orElse(BigDecimal.ZERO);
 		//设备销售金额
-		BigDecimal natureEpOrderMoney = statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(1, 2, null, startDate, endDate);
+		BigDecimal natureEpOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(1, 2, null, startDate, endDate)).orElse(BigDecimal.ZERO);
 		groupsDataStatisticsView.setNatureStreamingMoney(natureStreamingMoney);
 		groupsDataStatisticsView.setNatureAiOrderMoney(natureAiOrderMoney);
 		groupsDataStatisticsView.setNatureEpOrderMoney(natureEpOrderMoney);
@@ -464,11 +464,11 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 	public void getGroupsOrderCategoryData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
 		//渠道商+个人分销
 		//流媒体
-		BigDecimal groupsStreamingMoney = statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(2, null, 2l, startDate, endDate);
+		BigDecimal groupsStreamingMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(2, null, 2l, startDate, endDate)).orElse(BigDecimal.ZERO);
 		// AI销售金额
-		BigDecimal groupsAiOrderMoney = statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(2, null, 1l, startDate, endDate);
+		BigDecimal groupsAiOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(2, null, 1l, startDate, endDate)).orElse(BigDecimal.ZERO);
 		//设备销售金额
-		BigDecimal groupsEpOrderMoney = statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(2, 2, null, startDate, endDate);
+		BigDecimal groupsEpOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(2, 2, null, startDate, endDate)).orElse(BigDecimal.ZERO);
 		groupsDataStatisticsView.setGroupsStreamingMoney(groupsStreamingMoney);
 		groupsDataStatisticsView.setGroupsAiOrderMoney(groupsAiOrderMoney);
 		groupsDataStatisticsView.setGroupsEpOrderMoney(groupsEpOrderMoney);
@@ -476,7 +476,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 
 	public void getRenewOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
 		BigDecimal oriRenewOrderMoney = Optional.ofNullable(orderDonMapper.getOriRenewOrderMoney(startDate, endDate)).orElse(BigDecimal.ZERO);
-		BigDecimal clearRenewOrderMoney = orderDonMapper.getClearRenewOrderMoney(startDate, endDate);
+		BigDecimal clearRenewOrderMoney = Optional.ofNullable(orderDonMapper.getClearRenewOrderMoney(startDate, endDate)).orElse(BigDecimal.ZERO);
 		groupsDataStatisticsView.setRenewOrderMoney(oriRenewOrderMoney.add(clearRenewOrderMoney));
 		BigDecimal totalMoney = Optional.ofNullable(orderDonMapper.getTotalMoney(startDate, endDate)).orElse(BigDecimal.ZERO);
 		groupsDataStatisticsView.setNewBuyOrderMoney(totalMoney.subtract(groupsDataStatisticsView.getRenewOrderMoney()));