adjust the total amount

src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java

@@ -69,7 +69,8 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
 			message = message.replace("[Quantity]", orderItems.get(0).getQuantity() + "");
 			if (messageId == 6) {
 				if (operationMessage != null) {
-					message = message.replace("[TotalAmount]", order.getTotalAmount().toPlainString());
+//					message = message.replace("[TotalAmount]", order.getTotalAmount().toPlainString());
+					message = message.replace("[TotalAmount]", order.getTotalAmount().subtract(order.getVipmemberDiscount()).toPlainString());
 					message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().toPlainString());
 				}
 			} else if (messageId == 7 || messageId == 5) {

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

@@ -1163,7 +1163,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
         	actualAmount = new BigDecimal(0);
         }
         order.setActualAmount(actualAmount);
-        order.setVipmemberDiscount(abstractOrderBean.getDiscountAfterOrderAmount());
+        order.setVipmemberDiscount(abstractOrderBean.getDiscountAfterOrderAmount()==null?new BigDecimal(0):abstractOrderBean.getDiscountAfterOrderAmount());
         order.setVipmemberDiscountRate(abstractOrderBean.getDiscountRate());
         order.setRemark(abstractOrderBean.getRemarks());
         order.setUserType(userExtService.getByUid(abstractOrderBean.getUid()).getUserType());

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

@@ -616,7 +616,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
             } else {
                 // 不需走在线退款 ：手动退款或没有退在线支付
                 order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.REFUNDED.getValue());
-                if (order.getTotalAmount().subtract(refundAll.add(order.getOnPayAmount())).doubleValue() <= 0) {
+                if (order.getTotalAmount().subtract(order.getVipmemberDiscount()).subtract(refundAll.add(order.getOnPayAmount())).doubleValue() <= 0) {
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.ALL_UNSUBSCRIBED.getValue());
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.BARGAINED.getValue());
                     order.setOrderUserStatus(6);
@@ -628,7 +628,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
             }
             // 3.5、是否需要退保险
             if (order.getInsuranceAmount().compareTo(BigDecimal.ZERO) > 0 && order.getInsuranceStatus() == OrderInsuranceStatusEnum.INSURED.getValue()) {
-                if (order.getTotalAmount().subtract(refundAll.add(order.getOnPayAmount())).compareTo(order.getInsuranceAmount()) < 0) {
+                if (order.getTotalAmount().subtract(order.getVipmemberDiscount()).subtract(refundAll.add(order.getOnPayAmount())).compareTo(order.getInsuranceAmount()) < 0) {
                     boolean isCancelSuccess = getInsuranceProcessService().newExecuteCreateAndSendCancelRequest(order.getOrderId());
                     if (isCancelSuccess) {
                         order.setInsuranceStatus(OrderInsuranceStatusEnum.CANCELED.getValue());
@@ -671,7 +671,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
         }
 
         return order
-                .getTotalAmount()
+                .getTotalAmount().subtract(order.getVipmemberDiscount())
                 .subtract(
                         new BigDecimal(orderProcessBean.getPrePayCardRefundAmount() == null ? 0 : orderProcessBean.getPrePayCardRefundAmount()).add(
                                 refundVoucher.add(new BigDecimal(orderProcessBean.getRefundAmount() == null ? 0 : orderProcessBean.getRefundAmount()))).add(
@@ -1412,13 +1412,4 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
 
     }
 
-	public FlashSaleDao getFlashSaleDao() {
-		return flashSaleDao;
-	}
-
-	public void setFlashSaleDao(FlashSaleDao flashSaleDao) {
-		this.flashSaleDao = flashSaleDao;
-	}
-    
-
 }