修改

YijiaRestful/src/main/java/com/platform/yijia/controller/PayOrderController.java

@@ -672,6 +672,7 @@ public class PayOrderController {
                                 case "1":
                                     Map<String, Object> map = this.calcuteDengJiZhiJiang(params);
                                     discountAmt = discountAmt.add(new BigDecimal(map.get("discountAmt").toString()));
+                                    oilLiters = new BigDecimal(map.get("oilLiters").toString());
                                     amt = receivableAmt_b.subtract(discountAmt);
                                     discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? new BigDecimal(oilPrice) : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP);
                                     resultMap.put("discountAmt", discountAmt.doubleValue());
@@ -743,6 +744,7 @@ public class PayOrderController {
                                 case "1":
                                     Map<String, Object> map = this.calcuteDengJiZhiJiang(params);
                                     discountAmt = discountAmt.add(new BigDecimal(map.get("discountAmt").toString()));
+                                    oilLiters = new BigDecimal(map.get("oilLiters").toString());
                                     amt = receivableAmt_b.subtract(discountAmt);
                                     discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? new BigDecimal(oilPrice) : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP);
                                     //discountPrice = amt.divide(oilLiters, 2, BigDecimal.ROUND_UP);
@@ -812,6 +814,7 @@ public class PayOrderController {
                                     case "1":
                                         Map<String, Object> map = this.calcuteDengJiZhiJiang(params);
                                         discountAmt = discountAmt.add(new BigDecimal(map.get("discountAmt").toString()));
+                                        oilLiters = new BigDecimal(map.get("oilLiters").toString());
                                         amt = receivableAmt_b.subtract(discountAmt);
                                         discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? new BigDecimal(oilPrice) : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP);
                                         resultMap.put("discountAmt", discountAmt.doubleValue());
@@ -856,6 +859,7 @@ public class PayOrderController {
                                     case "1":
                                         Map<String, Object> map = this.calcuteDengJiZhiJiang(params);
                                         discountAmt = discountAmt.add(new BigDecimal(map.get("discountAmt").toString()));
+                                        oilLiters = new BigDecimal(map.get("oilLiters").toString());
                                         amt = receivableAmt_b.subtract(discountAmt);
                                         discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? new BigDecimal(oilPrice) : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP);
                                         resultMap.put("discountAmt", discountAmt.doubleValue());