modify a bug of null value

src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java

@@ -195,8 +195,12 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
         order.setVoucherCount(orderDetailBean.getVoucherList() == null ? 0 : orderDetailBean.getVoucherList().size());
     /*    BigDecimal actualAmount = totalAmount.subtract(orderDetailBean.getTmoney()).subtract(orderDetailBean.getLimitedEmoneyAmount()).subtract(orderDetailBean.getUnlimitedEmoneyAmount())
                 .subtract(orderDetailBean.getOnPayAmount());*/
+        BigDecimal discoutAfterOrder = orderDetailBean.getDiscountAfterOrderAmount();
+        if(discoutAfterOrder == null){
+        	discoutAfterOrder = new BigDecimal(0);
+        }
         BigDecimal actualAmount = totalAmount.subtract(orderDetailBean.getTmoney()).subtract(orderDetailBean.getLimitedEmoneyAmount()).subtract(orderDetailBean.getUnlimitedEmoneyAmount())
-        		.subtract(orderDetailBean.getOnPayAmount()).subtract(orderDetailBean.getDiscountAfterOrderAmount());;
+        		.subtract(orderDetailBean.getOnPayAmount()).subtract(discoutAfterOrder);;
 		if (actualAmount.compareTo(BigDecimal.ZERO) < 0) {
 			actualAmount = new BigDecimal(0);
 		}
@@ -1149,8 +1153,12 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
 /*        BigDecimal actualAmount = totalAmount.subtract(abstractOrderBean.getTmoney()).subtract(abstractOrderBean.getLimitedEmoneyAmount())
                 .subtract(abstractOrderBean.getUnlimitedEmoneyAmount()).subtract(abstractOrderBean.getOnPayAmount());*/
         //modify by caosy,重新调整实付金额
+        BigDecimal discoutAfterOrder = abstractOrderBean.getDiscountAfterOrderAmount();
+        if(discoutAfterOrder == null){
+        	discoutAfterOrder = new BigDecimal(0);
+        }
         BigDecimal actualAmount = totalAmount.subtract(abstractOrderBean.getTmoney()).subtract(abstractOrderBean.getLimitedEmoneyAmount())
-        		.subtract(abstractOrderBean.getUnlimitedEmoneyAmount()).subtract(abstractOrderBean.getOnPayAmount()).subtract(abstractOrderBean.getDiscountAfterOrderAmount());
+        		.subtract(abstractOrderBean.getUnlimitedEmoneyAmount()).subtract(abstractOrderBean.getOnPayAmount()).subtract(discoutAfterOrder);
         if(actualAmount.compareTo(BigDecimal.ZERO) < 0){
         	actualAmount = new BigDecimal(0);
         }