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 62eae953b..25f69aca2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -276,7 +276,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity record_limit_count = activityAwardsModel.getAwardsCount(); } } - if(record_limit_count > 0){ + if(record_limit_count != null && record_limit_count > 0){ OfflineActivityGrantRule grantRule = new OfflineActivityGrantRule(); grantRule.setRecordId(record.getId()); grantRule.setRecord(record); @@ -426,7 +426,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantAwardsItem = awardsItem; } } - if(grantAwardsItem != null){ + if(grantAwardsItem != null && grantAwardsItem.getCashBackRatio() != null){ //计算返现金额 BigDecimal cashBackPrice = record.getOrderMoney().multiply(grantAwardsItem.getCashBackRatio().divide(new BigDecimal(100))); if(grantAwardsItem.getLimitPrice() != null && grantAwardsItem.getLimitPrice().compareTo(BigDecimal.ZERO) > 0 @@ -458,7 +458,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantAwardsItem = awardsItem; } } - if(grantAwardsItem != null){ + if(grantAwardsItem != null && grantAwardsItem.getCashBackRatio() != null){ //计算返现金额 BigDecimal cashBackPrice = orderMoneySum