|
@@ -312,7 +312,6 @@ public class PayOrderController {
|
|
|
// oilLiters = receivableAmt.divide(oilPrice,2, BigDecimal.ROUND_UP);
|
|
|
// }
|
|
|
// settlementType:结算价类型(1.直降,2.折扣); settlementPrice:结算价; driverPrice:司机价;
|
|
|
-
|
|
|
if(params.containsKey("settlementType") && params.get("settlementType") !=null && params.get("settlementType").toString() !=""){
|
|
|
String settlementType = params.get("settlementType").toString();
|
|
|
switch (settlementType){
|
|
@@ -323,7 +322,6 @@ public class PayOrderController {
|
|
|
sellAmt = new BigDecimal(params.get("settlementPrice").toString()).multiply(oilLiters); //优惠
|
|
|
sellDiscountAmt = receivableAmt.subtract(sellAmt);
|
|
|
sellDiscountAmt = sellDiscountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
- //sellPrice = sellPrice.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
sellSumAmt = sellDiscountAmt;
|
|
|
sellSumDiscount = sellAmt;
|
|
|
}
|
|
@@ -335,7 +333,6 @@ public class PayOrderController {
|
|
|
sellAmt =sellPrice.multiply(oilLiters);
|
|
|
sellDiscountAmt = receivableAmt.subtract(sellAmt);
|
|
|
sellDiscountAmt = sellDiscountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
- //sellPrice = sellPrice.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
sellSumAmt = sellAmt;
|
|
|
sellSumDiscount = sellDiscountAmt;
|
|
|
}
|