|
|
@@ -426,12 +426,28 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
case 4:
|
|
|
getRenewOrderData(groupsDataStatisticsView, startDate, endDate);
|
|
|
break;
|
|
|
+ case 5:
|
|
|
+ getUnbindChannelOrderData(groupsDataStatisticsView, startDate, endDate);
|
|
|
+ break;
|
|
|
default:
|
|
|
getSynthesisData(groupsDataStatisticsView, startDate, endDate);
|
|
|
}
|
|
|
return groupsDataStatisticsView;
|
|
|
}
|
|
|
|
|
|
+ private void getUnbindChannelOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
|
|
|
+ //解绑渠道
|
|
|
+ //流媒体
|
|
|
+ BigDecimal unBIndGroupsStreamingMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, null, 2l, startDate, endDate)).orElse(BigDecimal.ZERO);
|
|
|
+ // AI销售金额
|
|
|
+ BigDecimal unBIndGroupsAiOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, null, 1l, startDate, endDate)).orElse(BigDecimal.ZERO);
|
|
|
+ //设备销售金额
|
|
|
+ BigDecimal unBIndGroupsEpOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, 2, null, startDate, endDate)).orElse(BigDecimal.ZERO);
|
|
|
+ groupsDataStatisticsView.setUnBIndGroupsStreamingMoney(unBIndGroupsStreamingMoney);
|
|
|
+ groupsDataStatisticsView.setUnBIndGroupsAiOrderMoney(unBIndGroupsAiOrderMoney);
|
|
|
+ groupsDataStatisticsView.setUnBIndGroupsEpOrderMoney(unBIndGroupsEpOrderMoney);
|
|
|
+ }
|
|
|
+
|
|
|
public void getNatureOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
|
|
|
List<NatureOrderDataDto> orderDataList = statisticsExportMapper.getGroupsOrderData(startDate, endDate);
|
|
|
orderDataList.forEach(data -> {
|
|
|
@@ -447,6 +463,9 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
if (data.getType() == 3) {
|
|
|
groupsDataStatisticsView.setChannelMoney(money);
|
|
|
}
|
|
|
+ if (data.getType() == 4) {
|
|
|
+ groupsDataStatisticsView.setUnBindChannelMoney(money);
|
|
|
+ }
|
|
|
});
|
|
|
if (groupsDataStatisticsView.getNatureMoney() == null) {
|
|
|
groupsDataStatisticsView.setNatureMoney(BigDecimal.ZERO);
|
|
|
@@ -505,6 +524,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
try {
|
|
|
getGroupsOrderCategoryData(groupsDataStatisticsView, startDate, endDate);
|
|
|
getRenewOrderData(groupsDataStatisticsView, startDate, endDate);
|
|
|
+ getUnbindChannelOrderData(groupsDataStatisticsView, startDate, endDate);
|
|
|
} finally {
|
|
|
latch.countDown();
|
|
|
}
|