|
@@ -305,10 +305,10 @@ public class PayOrderController {
|
|
}
|
|
}
|
|
dzkDiscountAmt = discountAmt; //赋值电子卡优惠金额
|
|
dzkDiscountAmt = discountAmt; //赋值电子卡优惠金额
|
|
}
|
|
}
|
|
- amt = receivableAmt.subtract(discountAmt); //应收金额
|
|
|
|
- amt =amt.signum() == -1 ? new BigDecimal("0.01"): amt;
|
|
|
|
- discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? discountPrice : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP); //优惠价格
|
|
|
|
}
|
|
}
|
|
|
|
+ amt = receivableAmt.subtract(discountAmt); //应收金额
|
|
|
|
+ amt =amt.signum() == -1 ? new BigDecimal("0.01"): amt;
|
|
|
|
+ discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? discountPrice : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP); //优惠价格
|
|
payOrderResultInfo.setAmt(amt.toString());
|
|
payOrderResultInfo.setAmt(amt.toString());
|
|
payOrderResultInfo.setDiscountPrice(discountPrice.toString());
|
|
payOrderResultInfo.setDiscountPrice(discountPrice.toString());
|
|
payOrderResultInfo.setDiscountAmt(discountAmt.toString());
|
|
payOrderResultInfo.setDiscountAmt(discountAmt.toString());
|