|
|
|
@@ -85,7 +85,7 @@ public class WxVtwoActivityGrantStatisticsServiceImpl implements WxVtwoActivityG |
|
|
|
if(EnumOfflineActivityType.CASHBACK.getCode().equals(statisticsVo.getActivityType())){ |
|
|
|
List<WxVtwoAwardStatistics> activityAwardStatistics_1 = wxVtwoCashBackGrantService.activityAwardStatisticsChart(statisticsVo); |
|
|
|
if(activityAwardStatistics_1 != null && !activityAwardStatistics_1.isEmpty()){ |
|
|
|
activityAwardStatisticsMap = activityAwardStatistics_1.stream().collect(Collectors.toMap(WxVtwoAwardStatistics::getXTime, Function.identity())); |
|
|
|
activityGrantStatisticsMap = activityAwardStatistics_1.stream().collect(Collectors.toMap(WxVtwoAwardStatistics::getXTime, Function.identity())); |
|
|
|
} |
|
|
|
List<Long> amountAwardIdList = wxVtwoCashBackAwardService.getAmountAwardIdList(statisticsVo.getActivityId(),statisticsVo.getTenantId()); |
|
|
|
List<WxVtwoAwardStatistics> activityAwardStatistics_2 = wxVtwoActivityGrantSettlementService.activityAmountCashBackStatisticsChart(statisticsVo,amountAwardIdList); |
|
|
|
@@ -96,7 +96,7 @@ public class WxVtwoActivityGrantStatisticsServiceImpl implements WxVtwoActivityG |
|
|
|
}else{ |
|
|
|
List<WxVtwoAwardStatistics> activityAwardStatistics_1 = wxVtwoActivityGrantService.activityAwardStatisticsChart(statisticsVo); |
|
|
|
if(activityAwardStatistics_1 != null && !activityAwardStatistics_1.isEmpty()){ |
|
|
|
activityAwardStatisticsMap = activityAwardStatistics_1.stream().collect(Collectors.toMap(WxVtwoAwardStatistics::getXTime, Function.identity())); |
|
|
|
activityGrantStatisticsMap = activityAwardStatistics_1.stream().collect(Collectors.toMap(WxVtwoAwardStatistics::getXTime, Function.identity())); |
|
|
|
} |
|
|
|
List<WxVtwoAwardStatistics> activityAwardStatistics_2 = wxVtwoActivityGrantAwardService.activityAwardCountStatisticsChart(statisticsVo); |
|
|
|
if(activityAwardStatistics_2 != null && !activityAwardStatistics_2.isEmpty()){ |
|
|
|
|