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 24a0636fb..cf6418dd0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -829,7 +829,12 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity List grantItemList = wxOfflineActivityGrantItemMapper.findList(grantItemQ); Map> activityItemGrantMap = grantItemList.stream().collect(groupingBy(WxOfflineActivityGrantItem::getActivityItemId)); for (WxOfflineActivityItem activityItem : grantAward.getActivityItemList()) { - activityItem.setActivityGrantCashBack(cashBackMap.get(activityItem.getId())); + WxOfflineActivityGrantCashBack cashBack = cashBackMap.get(activityItem.getId()); + if(cashBack != null){ + activityItem.setActivityGrantCashBack(cashBackMap.get(activityItem.getId())); + activityItem.setCashBackPrice(cashBack.getCashBackPrice().subtract(cashBack.getTaxPointsAmount())); + } + List grantActivityItemList = activityItemGrantMap.get(activityItem.getId()); if (grantActivityItemList == null || grantActivityItemList.isEmpty()) { activityItem.setIsMeet(false);