//offlineActivity

mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

@@ -829,7 +829,12 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
             List<WxOfflineActivityGrantItem> grantItemList = wxOfflineActivityGrantItemMapper.findList(grantItemQ);
             Map<Long, List<WxOfflineActivityGrantItem>> 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<WxOfflineActivityGrantItem> grantActivityItemList = activityItemGrantMap.get(activityItem.getId());
                 if (grantActivityItemList == null || grantActivityItemList.isEmpty()) {
                     activityItem.setIsMeet(false);