Browse Source

//offlineActivity

release_toaliyun_real
xiaohu 1 year ago
parent
commit
a6a7c1c56e
1 changed files with 7 additions and 6 deletions
  1. +7
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

+ 7
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java View File

@@ -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()));



Loading…
Cancel
Save