| 
														
															@@ -203,6 +203,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             if(data != null) { 
														 | 
														
														 | 
														
															             if(data != null) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 couponAmount = data.getDiscountedPrices(); 
														 | 
														
														 | 
														
															                 couponAmount = data.getDiscountedPrices(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } 
														 | 
														
														 | 
														
															             } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            if (couponAmount.compareTo(orderParam.getOrderAmount()) > 0) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                couponAmount = orderParam.getOrderAmount(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             handleCouponAmount(orderItemList, couponAmount); 
														 | 
														
														 | 
														
															             handleCouponAmount(orderItemList, couponAmount); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         //判断是否使用积分 
														 | 
														
														 | 
														
															         //判断是否使用积分 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -259,8 +262,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setIntegration(orderParam.getUseIntegration()); 
														 | 
														
														 | 
														
															             order.setIntegration(orderParam.getUseIntegration()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             order.setIntegrationAmount(calcIntegrationAmount(orderItemList)); 
														 | 
														
														 | 
														
															             order.setIntegrationAmount(calcIntegrationAmount(orderItemList)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        BigDecimal payAmount = calcPayAmount(order); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        LOG.info("payAmount:{},totalAmount:{},couponAmount:{}",payAmount,order.getTotalAmount(),couponAmount); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        LOG.info("payAmount:{},totalAmount:{},couponAmount:{}",order.getTotalAmount().subtract(couponAmount),order.getTotalAmount(),couponAmount); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (orderParam.getOrderAmount().compareTo(order.getTotalAmount().subtract(couponAmount)) != 0) { 
														 | 
														
														 | 
														
															         if (orderParam.getOrderAmount().compareTo(order.getTotalAmount().subtract(couponAmount)) != 0) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             throw new BizException("订单金额校验不通过"); 
														 | 
														
														 | 
														
															             throw new BizException("订单金额校验不通过"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 |