| 
														
															@@ -836,7 +836,7 @@ public class PayOrderController { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                                 discountAmt = oilLiters.multiply(gasoilDiscountAmt_b); 
														 | 
														
														 | 
														
															                                 discountAmt = oilLiters.multiply(gasoilDiscountAmt_b); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                                 discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP); 
														 | 
														
														 | 
														
															                                 discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                                 amt = receivableAmt_b.subtract(discountAmt); 
														 | 
														
														 | 
														
															                                 amt = receivableAmt_b.subtract(discountAmt); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                                discountPrice = oilLiters !=new BigDecimal("0.00") ? new BigDecimal(oilPrice) : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                                discountPrice = oilLiters.equals(new BigDecimal("0.00")) ? new BigDecimal(oilPrice) : amt.divide(oilLiters, 2, BigDecimal.ROUND_HALF_UP); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                                 //是否共享会员优惠叠加 
														 | 
														
														 | 
														
															                                 //是否共享会员优惠叠加 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                                 if(vipDiscountyPlus_4.equals("1")){ 
														 | 
														
														 | 
														
															                                 if(vipDiscountyPlus_4.equals("1")){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                                     Map<String, Object> map = this.calcuteDengJiZhiJiang(params); 
														 | 
														
														 | 
														
															                                     Map<String, Object> map = this.calcuteDengJiZhiJiang(params); 
														 |