|
@@ -329,8 +329,6 @@ public class PayOrderController {
|
|
|
BigDecimal sellAmt = new BigDecimal(0); //油站结算价支付金额
|
|
|
BigDecimal discountPrice = oilPrice; //司机销售价
|
|
|
BigDecimal sellPrice = discountPrice; //油站销售价
|
|
|
-// BigDecimal sellSumAmt = amt; //销售价支付金额
|
|
|
-// BigDecimal sellSumDiscount = new BigDecimal("0"); //销售价优惠金额
|
|
|
//加油升数
|
|
|
oilLiters = receivableAmt.divide(oilPrice,2, BigDecimal.ROUND_HALF_UP);
|
|
|
// if(!oilLiters.toString().substring(oilLiters.toString().indexOf(".") + 1).equals("00")){
|
|
@@ -347,8 +345,6 @@ public class PayOrderController {
|
|
|
sellAmt = sellPrice.multiply(oilLiters); //优惠价实付金额
|
|
|
sellDiscountAmt = receivableAmt.subtract(sellAmt);
|
|
|
sellDiscountAmt = sellDiscountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
-// sellSumAmt = sellAmt; //优惠价实付金额
|
|
|
-// sellSumDiscount = sellDiscountAmt; //优惠价优惠金额
|
|
|
}
|
|
|
break;
|
|
|
case "2": //折扣
|
|
@@ -358,8 +354,6 @@ public class PayOrderController {
|
|
|
sellAmt =sellPrice.multiply(oilLiters);
|
|
|
sellDiscountAmt = receivableAmt.subtract(sellAmt);
|
|
|
sellDiscountAmt = sellDiscountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
-// sellSumAmt = sellAmt;
|
|
|
-// sellSumDiscount = sellDiscountAmt;
|
|
|
}
|
|
|
break;
|
|
|
}
|