Просмотр исходного кода

//activity v.2

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
d1046b2998
2 измененных файлов: 3 добавлений и 3 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantStatisticsServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml

+ 2
- 2
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())){ if(EnumOfflineActivityType.CASHBACK.getCode().equals(statisticsVo.getActivityType())){
List<WxVtwoAwardStatistics> activityAwardStatistics_1 = wxVtwoCashBackGrantService.activityAwardStatisticsChart(statisticsVo); List<WxVtwoAwardStatistics> activityAwardStatistics_1 = wxVtwoCashBackGrantService.activityAwardStatisticsChart(statisticsVo);
if(activityAwardStatistics_1 != null && !activityAwardStatistics_1.isEmpty()){ 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<Long> amountAwardIdList = wxVtwoCashBackAwardService.getAmountAwardIdList(statisticsVo.getActivityId(),statisticsVo.getTenantId());
List<WxVtwoAwardStatistics> activityAwardStatistics_2 = wxVtwoActivityGrantSettlementService.activityAmountCashBackStatisticsChart(statisticsVo,amountAwardIdList); List<WxVtwoAwardStatistics> activityAwardStatistics_2 = wxVtwoActivityGrantSettlementService.activityAmountCashBackStatisticsChart(statisticsVo,amountAwardIdList);
@@ -96,7 +96,7 @@ public class WxVtwoActivityGrantStatisticsServiceImpl implements WxVtwoActivityG
}else{ }else{
List<WxVtwoAwardStatistics> activityAwardStatistics_1 = wxVtwoActivityGrantService.activityAwardStatisticsChart(statisticsVo); List<WxVtwoAwardStatistics> activityAwardStatistics_1 = wxVtwoActivityGrantService.activityAwardStatisticsChart(statisticsVo);
if(activityAwardStatistics_1 != null && !activityAwardStatistics_1.isEmpty()){ 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); List<WxVtwoAwardStatistics> activityAwardStatistics_2 = wxVtwoActivityGrantAwardService.activityAwardCountStatisticsChart(statisticsVo);
if(activityAwardStatistics_2 != null && !activityAwardStatistics_2.isEmpty()){ if(activityAwardStatistics_2 != null && !activityAwardStatistics_2.isEmpty()){


+ 1
- 1
mallinkService/src/main/resources/mapper/WxVtwoCashBackGrantAwardMapper.xml Просмотреть файл

@@ -122,7 +122,7 @@


<select id="awardItemStatistics" parameterType="com.iformall.domain.po.WxVtwoCashBackGrantAward" resultType="com.iformall.domain.vo.WxVtwoAwardGrantStatistics"> <select id="awardItemStatistics" parameterType="com.iformall.domain.po.WxVtwoCashBackGrantAward" resultType="com.iformall.domain.vo.WxVtwoAwardGrantStatistics">
SELECT award_id as 'awardId', SELECT award_id as 'awardId',
IFNULL(sum(cash_back),0) as 'awardPrice',
IFNULL(sum(cash_back),0) as 'awardPrice'
FROM wx_vtwo_cash_back_grant_award FROM wx_vtwo_cash_back_grant_award
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
group by award_id group by award_id


Загрузка…
Отмена
Сохранить