|
|
@@ -95,7 +95,15 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
*/
|
|
|
private void getRegisterAccountData(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
|
|
|
if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(),1)).equals(endDate)) {
|
|
|
- backgroundDataView.setRegisterAccountDataViews(statistics.statisticsRegisterAccountData(startDate, endDate, true));
|
|
|
+ List<RegisterAccountData> registerAccountData = statistics.statisticsRegisterAccountData(startDate, endDate, true);
|
|
|
+ List<RegisterAccountData> collect = registerAccountData.stream().filter(data -> {
|
|
|
+ if (data.getNumOfUser() != null && data.getNumOfUser() > 0) {
|
|
|
+ data.setMoney(data.getMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ backgroundDataView.setRegisterAccountDataViews(collect);
|
|
|
}else {
|
|
|
List<RegisterAccountData> registerAccountData = realGoodsDataMapper.statisticsRegisterAccountData(startDate, endDate);
|
|
|
backgroundDataView.setRegisterAccountDataViews(registerAccountData);
|
|
|
@@ -135,7 +143,19 @@ 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)) {
|
|
|
- backgroundDataView.setAppleOneDataViews(statistics.statisticsAppleOneData(startDate, endDate, true));
|
|
|
+ List<AppleOneData> appleOneData1 = statistics.statisticsAppleOneData(startDate, endDate, true);
|
|
|
+ List<AppleOneData> collect = appleOneData1.stream().filter(data -> {
|
|
|
+ if (data.getNumOfUser() != null && data.getNumOfUser() > 0) {
|
|
|
+ data.setMoney(data.getMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ data.setDistributeOrderMoney(data.getDistributeOrderMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ collect.forEach(data -> {
|
|
|
+ data.setMoney(data.getMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ });
|
|
|
+ backgroundDataView.setAppleOneDataViews(collect);
|
|
|
}else {
|
|
|
backgroundDataView.setAppleOneDataViews(appleOneData);
|
|
|
}
|
|
|
@@ -143,7 +163,16 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
|
|
|
private void getStreamingAccountDataView(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
|
|
|
if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(),1)).equals(endDate)) {
|
|
|
- backgroundDataView.setStreamAccountDataViews(statistics.statisticsStreamingAccountData(startDate, endDate, true));
|
|
|
+ List<StreamingAccountData> streamingAccountData = statistics.statisticsStreamingAccountData(startDate, endDate, true);
|
|
|
+ List<StreamingAccountData> collect = streamingAccountData.stream().filter(data -> {
|
|
|
+ if (data.getNumOfUser() != null && data.getNumOfUser() > 0) {
|
|
|
+ data.setMoney(data.getMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ data.setDistributeOrderMoney(data.getDistributeOrderMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ backgroundDataView.setStreamAccountDataViews(collect);
|
|
|
}else {
|
|
|
List<StreamingAccountData> streamingAccountData = streamingAccountDataMapper.statisticsStreamingData(startDate, endDate);
|
|
|
Optional.ofNullable(streamingAccountData).ifPresent(list->list.forEach(data->{
|
|
|
@@ -159,7 +188,13 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
|
|
|
private void getRealGoodsData(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
|
|
|
if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(),1)).equals(endDate)) {
|
|
|
List<RealGoodsData> realGoodsData = statistics.statisticsRealGoodsData(startDate, endDate, true);
|
|
|
- List<RealGoodsData> collect = realGoodsData.stream().filter(data -> data.getNumOfUser() != 0).collect(Collectors.toList());
|
|
|
+ List<RealGoodsData> collect = realGoodsData.stream().filter(data ->{
|
|
|
+ if (data.getNumOfUser() != null && data.getNumOfUser() > 0) {
|
|
|
+ data.setMoney(data.getMoney().divide(BigDecimal.valueOf(100)));
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
backgroundDataView.setRealGoodsDataViews(collect);
|
|
|
}else {
|
|
|
List<RealGoodsData> realGoodsData = realGoodsDataMapper.statisticsRealGoodsData(startDate, endDate);
|