|
|
@@ -436,7 +436,6 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
|
|
|
|
|
|
private void getAppleOneDataView(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
|
|
|
- List<AppleOneData> appleOneData = appleOneDataMapper.statisticsAppleOneData(startDate, endDate);
|
|
|
if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(), 1)).equals(endDate)) {
|
|
|
List<AppleOneData> appleOneData1 = statistics.statisticsAppleOneData(startDate, endDate, true);
|
|
|
List<AppleOneData> collect = appleOneData1.stream().filter(data -> {
|
|
|
@@ -450,6 +449,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
}).collect(Collectors.toList());
|
|
|
backgroundDataView.setAppleOneDataViews(collect);
|
|
|
} else {
|
|
|
+ List<AppleOneData> appleOneData = appleOneDataMapper.statisticsAppleOneData(startDate, endDate);
|
|
|
appleOneData.forEach(data -> {
|
|
|
data.setRefundMoney(getAppleOneRefundMoneyByArea(data.getAreaName(), startDate, endDate));
|
|
|
});
|