From 8aab0739b4ab11904595644cd76026a2a39b8868 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 25 Nov 2024 10:52:22 +0800 Subject: [PATCH] //offlineActivity --- .../service/impl/WxOfflineActivityGrantAwardServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 674ef110b..7600c5b68 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -956,7 +956,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity Map> granActivityItemMap = grantItemList.stream().collect(groupingBy(WxOfflineActivityGrantItem::getActivityItemId)); Map> grantSettlementMap = settlementList.stream().collect(groupingBy(WxOfflineActivityGrantSettlement::getActivityItemId)); - Map grantCashMap = cashBackList.stream().collect(toMap(WxOfflineActivityGrantCashBack::getActivityItemId, Function.identity())); + Map grantCashMap = new HashMap<>(); + if(cashBackList != null && !cashBackList.isEmpty()){ + grantCashMap = cashBackList.stream().collect(toMap(WxOfflineActivityGrantCashBack::getActivityItemId, Function.identity())); + } for (WxOfflineActivityItem activityItem : activity.getActivityItemList()) { List granActivityItemList = granActivityItemMap.get(activityItem.getId());