From d1046b2998c46afb2019151567650ed57734f285 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Thu, 29 May 2025 02:45:13 +0800 Subject: [PATCH] //activity v.2 --- .../impl/WxVtwoActivityGrantStatisticsServiceImpl.java | 4 ++-- .../main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantStatisticsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantStatisticsServiceImpl.java index c6266bfc0..dd6565157 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantStatisticsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantStatisticsServiceImpl.java @@ -85,7 +85,7 @@ public class WxVtwoActivityGrantStatisticsServiceImpl implements WxVtwoActivityG if(EnumOfflineActivityType.CASHBACK.getCode().equals(statisticsVo.getActivityType())){ List 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 amountAwardIdList = wxVtwoCashBackAwardService.getAmountAwardIdList(statisticsVo.getActivityId(),statisticsVo.getTenantId()); List activityAwardStatistics_2 = wxVtwoActivityGrantSettlementService.activityAmountCashBackStatisticsChart(statisticsVo,amountAwardIdList); @@ -96,7 +96,7 @@ public class WxVtwoActivityGrantStatisticsServiceImpl implements WxVtwoActivityG }else{ List 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 activityAwardStatistics_2 = wxVtwoActivityGrantAwardService.activityAwardCountStatisticsChart(statisticsVo); if(activityAwardStatistics_2 != null && !activityAwardStatistics_2.isEmpty()){ diff --git a/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml index 7c1567d8e..3e68372ca 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml @@ -122,7 +122,7 @@