From 8b18cc69adecebc451410927455c231eb41b26bd Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Sun, 27 Apr 2025 14:12:19 +0800 Subject: [PATCH] //AwardsItem --- .../service/impl/WxOfflineActivityGrantAwardServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 e5e7d476b..62eae953b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -481,7 +481,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity if(jointCount != 0 && activityItem.getActivityAwardsItemSecondList() != null && !activityItem.getActivityAwardsItemSecondList().isEmpty()){ Map jointCountMap = activityItem.getActivityAwardsItemSecondList().stream().collect(toMap(WxOfflineActivityAwardsItem::getMerchantCount, Function.identity())); WxOfflineActivityAwardsItem awardsSecondItem = jointCountMap.get(jointCount); - if(awardsSecondItem != null){ + if(awardsSecondItem != null && awardsSecondItem.getCashBackRatio() != null){ BigDecimal orderMoneySum = recordList.stream().map(WxOfflineActivityRecord::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add); //计算返现金额 BigDecimal cashBackPrice = orderMoneySum