|
|
@@ -330,8 +330,8 @@ public class PayOrderController {
|
|
|
BigDecimal sellAmt = new BigDecimal(0); //油站结算价支付金额
|
|
|
BigDecimal discountPrice = oilPrice; //司机销售价
|
|
|
BigDecimal sellPrice = discountPrice; //油站销售价
|
|
|
- BigDecimal sellSumAmt = amt; //销售价支付金额
|
|
|
- BigDecimal sellSumDiscount = new BigDecimal("0"); //销售价优惠金额
|
|
|
+// 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")){
|
|
|
@@ -348,8 +348,8 @@ public class PayOrderController {
|
|
|
sellAmt = sellPrice.multiply(oilLiters); //优惠价实付金额
|
|
|
sellDiscountAmt = receivableAmt.subtract(sellAmt);
|
|
|
sellDiscountAmt = sellDiscountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
- sellSumAmt = sellAmt; //优惠价实付金额
|
|
|
- sellSumDiscount = sellDiscountAmt; //优惠价优惠金额
|
|
|
+// sellSumAmt = sellAmt; //优惠价实付金额
|
|
|
+// sellSumDiscount = sellDiscountAmt; //优惠价优惠金额
|
|
|
}
|
|
|
break;
|
|
|
case "2": //折扣
|
|
|
@@ -359,8 +359,8 @@ public class PayOrderController {
|
|
|
sellAmt =sellPrice.multiply(oilLiters);
|
|
|
sellDiscountAmt = receivableAmt.subtract(sellAmt);
|
|
|
sellDiscountAmt = sellDiscountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
- sellSumAmt = sellAmt;
|
|
|
- sellSumDiscount = sellDiscountAmt;
|
|
|
+// sellSumAmt = sellAmt;
|
|
|
+// sellSumDiscount = sellDiscountAmt;
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
@@ -370,16 +370,14 @@ public class PayOrderController {
|
|
|
//司机价
|
|
|
discountPrice = sellPrice.multiply(new BigDecimal(params.get("driverPrice").toString())).divide(new BigDecimal("100"));
|
|
|
//amt = oilLiters.toString().equals("0.00")? new BigDecimal("0.01") : discountPrice.multiply(oilLiters);
|
|
|
- amt = sellSumAmt.multiply(new BigDecimal(params.get("driverPrice").toString())).divide(new BigDecimal("100"));
|
|
|
+ amt = sellAmt.multiply(new BigDecimal(params.get("driverPrice").toString())).divide(new BigDecimal("100"));
|
|
|
//amt = discountPrice.multiply(oilLiters); //二次折扣优惠金额
|
|
|
//amt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
discountAmt = receivableAmt.subtract(amt);
|
|
|
discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
discountPrice = discountPrice.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
- //sellAmt = receivableAmt.subtract(sellDiscountAmt); //销售价实收金额 = 应收金额-销售价优惠金额
|
|
|
sellAmt =sellAmt.signum() == -1 ? new BigDecimal("0.01"): sellAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
- //amt = receivableAmt.subtract(discountAmt).subtract(sellDiscountAmt); //司机价实收金额 = 应收金额-司机价优惠金额-销售价优惠金额
|
|
|
amt =amt.signum() == -1 ? new BigDecimal("0.01"): amt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
payOrderResultInfo.setReceivableAmt(receivableAmt.toString()); //应收金额
|
|
|
@@ -390,10 +388,10 @@ public class PayOrderController {
|
|
|
payOrderResultInfo.setDiscountPrice(discountPrice.toString()); //司机价
|
|
|
payOrderResultInfo.setDiscountAmt(discountAmt.toString()); //司机价后优惠金额
|
|
|
|
|
|
- payOrderResultInfo.setSellAmt(sellSumAmt.toString()); //销售价后支付金额
|
|
|
- sellPrice.setScale(2, BigDecimal.ROUND_HALF_UP); //销售价
|
|
|
+ payOrderResultInfo.setSellAmt(sellAmt.toString()); //销售价后支付金额
|
|
|
+ sellPrice = sellPrice.setScale(2, BigDecimal.ROUND_HALF_UP); //销售价
|
|
|
payOrderResultInfo.setSellPrice(sellPrice.toString()); //销售价
|
|
|
- payOrderResultInfo.setSellDiscountAmt(sellSumDiscount.toString()); //销售价后优惠金额
|
|
|
+ payOrderResultInfo.setSellDiscountAmt(sellDiscountAmt.toString()); //销售价后优惠金额
|
|
|
|
|
|
//LNG加气平台没有电子卡功能：此下参数无用用作填充参数值 0：代表否；4：代表LNG油品
|
|
|
payOrderResultInfo.setDzkAmt(amt.toString()); //电子卡支付金额
|
JK