|
@@ -579,7 +579,7 @@ public class PayOrderController {
|
|
//用户第一次购买 取等级最低初始会员的优惠条件计算
|
|
//用户第一次购买 取等级最低初始会员的优惠条件计算
|
|
oilLiters = receivableAmt_b.divide(new BigDecimal(oilPrice), 2, BigDecimal.ROUND_HALF_UP); //加油升数
|
|
oilLiters = receivableAmt_b.divide(new BigDecimal(oilPrice), 2, BigDecimal.ROUND_HALF_UP); //加油升数
|
|
|
|
|
|
- if(customerGradeInfo.get(0).get("gasoilDiscountLitre") !=null){
|
|
|
|
|
|
+ if(customerGradeList.get(0).get("gasoilDiscountLitre") !=null){
|
|
discountAmt = oilLiters.multiply(new BigDecimal(customerGradeList.get(0).get("gasoilDiscountLitre").toString()));
|
|
discountAmt = oilLiters.multiply(new BigDecimal(customerGradeList.get(0).get("gasoilDiscountLitre").toString()));
|
|
discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
}else {
|
|
}else {
|