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 a5cf1ac7a..5d500a5e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -252,8 +252,11 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity grantAwardsItem = awardsItem; } } - if(grantAwardsItem == null){ - continue; + if(grantAwardsItem != null){ + //计算返现金额 + BigDecimal cashBackPrice = record.getOrderMoney() + .multiply(grantAwardsItem.getCashBackRatio().divide(new BigDecimal(100))); + cashBackPriceTotal = cashBackPriceTotal.add(cashBackPrice); } // WxOfflineActivityGrantItem grantItem = new WxOfflineActivityGrantItem(); @@ -287,10 +290,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity //// grantItem.setMerchantSharePrice(grantAwardsItem.getMerchantSharePrice()); // grantItemList.add(grantItem); - //计算返现金额 - BigDecimal cashBackPrice = record.getOrderMoney() - .multiply(grantAwardsItem.getCashBackRatio().divide(new BigDecimal(100))); - cashBackPriceTotal = cashBackPriceTotal.add(cashBackPrice); + } }else{ @@ -352,6 +352,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity activityGrantCashBack.setTaxPointsAmount(activityGrantCashBack.getCashBackPrice().multiply(activityGrantCashBack.getTaxPoints()) .divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP)); } + activityItem.setIsMeet(true); activityItem.setActivityGrantCashBack(activityGrantCashBack); activityItem.setCashBackPrice(activityGrantCashBack.getCashBackPrice().subtract(activityGrantCashBack.getTaxPointsAmount()));