From bae63dd4fd4f9f919a1eac87c96bb4762cba8a45 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 12 Aug 2024 23:39:59 +0800 Subject: [PATCH] //OfflineActivity --- .../impl/WxOfflineActivityGrantAwardServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 c7e566139..ed4948c2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -178,7 +178,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity } activityItem.setIsMeet(true); //奖项限制数量 - int limitCount = wxOfflineActivityGrantAward.getOrderMoneySum() / activityItem.getAwardsItemPrice(); + int limitCount = 0; + if(activityItem.getAwardsItemPrice() != null || activityItem.getAwardsItemPrice() > 0){ + limitCount = wxOfflineActivityGrantAward.getOrderMoneySum() / activityItem.getAwardsItemPrice(); + } if(activityItem.getAwardsItemLimit() != null && activityItem.getAwardsItemLimit() > 0 && activityItem.getAwardsItemLimit() < limitCount){ limitCount = activityItem.getAwardsItemLimit(); @@ -337,12 +340,15 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity throw new MallinkException(Result.ERROR, "活动项"+activityItem.getName()+"金额不满足"); } //奖项限制数量 - int limitCount = wxOfflineActivityGrantAward.getOrderMoneySum() / activityItem.getAwardsItemPrice(); + int limitCount = 0; + if(activityItem.getAwardsItemPrice() != null || activityItem.getAwardsItemPrice() > 0){ + limitCount = wxOfflineActivityGrantAward.getOrderMoneySum() / activityItem.getAwardsItemPrice(); + } if(activityItem.getAwardsItemLimit() != null && activityItem.getAwardsItemLimit() > 0 && activityItem.getAwardsItemLimit() < limitCount){ limitCount = activityItem.getAwardsItemLimit(); } - if(activityGrantItemList.stream().mapToInt(WxOfflineActivityGrantItem::getAwardCount).sum()>limitCount){ + if(limitCount != 0 && activityGrantItemList.stream().mapToInt(WxOfflineActivityGrantItem::getAwardCount).sum()>limitCount){ throw new MallinkException(Result.ERROR, "活动项"+activityItem.getName()+"奖券超过限制"); }