|
|
@@ -450,9 +450,11 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
BigDecimal unBIndGroupsAiOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, null, 1l, startDate, endDate, true)).orElse(BigDecimal.ZERO);
|
|
|
//设备销售金额
|
|
|
BigDecimal unBIndGroupsEpOrderMoney = Optional.ofNullable(statisticsExportMapper.getMonthGoodsTypeAmountOfOrderByType(4, 2, null, startDate, endDate, true)).orElse(BigDecimal.ZERO);
|
|
|
+ BigDecimal wholesaleOrderMoney = Optional.ofNullable(statisticsExportMapper.getWholesaleOrderMoney(startDate, endDate)).orElse(BigDecimal.ZERO);
|
|
|
groupsDataStatisticsView.setUnBIndGroupsStreamingMoney(unBIndGroupsStreamingMoney);
|
|
|
groupsDataStatisticsView.setUnBIndGroupsAiOrderMoney(unBIndGroupsAiOrderMoney);
|
|
|
groupsDataStatisticsView.setUnBIndGroupsEpOrderMoney(unBIndGroupsEpOrderMoney);
|
|
|
+ groupsDataStatisticsView.setWholesaleOrderMoney(wholesaleOrderMoney);
|
|
|
}
|
|
|
|
|
|
public void getNatureOrderData(GroupsDataStatisticsView groupsDataStatisticsView, String startDate, String endDate) {
|