add the vipmemberdiscount to orderpay

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOpOrderBean.java

@@ -271,6 +271,11 @@ public abstract class AbstractOpOrderBean {
     private Boolean deleteFlag;
 
     private Boolean onlineOrderFlag;
+    
+    /**正常下单后优惠的价格，不是一开始就知道的 优惠价格*/
+    private BigDecimal discountAfterOrderAmount;
+    /**一种折扣*/
+    private BigDecimal discountRate;
 
     public long getOrderNo() {
         return orderNo;
@@ -790,4 +795,20 @@ public abstract class AbstractOpOrderBean {
         this.onlineOrderFlag = onlineOrderFlag;
     }
 
+	public BigDecimal getDiscountAfterOrderAmount() {
+		return discountAfterOrderAmount;
+	}
+
+	public void setDiscountAfterOrderAmount(BigDecimal discountAfterOrderAmount) {
+		this.discountAfterOrderAmount = discountAfterOrderAmount;
+	}
+
+	public BigDecimal getDiscountRate() {
+		return discountRate;
+	}
+
+	public void setDiscountRate(BigDecimal discountRate) {
+		this.discountRate = discountRate;
+	}
+
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderBean.java

@@ -102,9 +102,10 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
     
     private boolean canDelete;
     
-    private BigDecimal vipmemberDiscount;
-    
-    private BigDecimal vipmemberDiscountRate;
+    /**正常下单后优惠的价格，不是一开始就知道的 优惠价格*/
+    private BigDecimal discountAfterOrderAmount;
+    /**一种折扣*/
+    private BigDecimal discountRate;
 
 	// ------------------
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -584,21 +585,20 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
         this.canDelete = canDelete;
     }
 
-	public BigDecimal getVipmemberDiscount() {
-		return vipmemberDiscount;
+	public BigDecimal getDiscountAfterOrderAmount() {
+		return discountAfterOrderAmount;
 	}
 
-	public void setVipmemberDiscount(BigDecimal vipmemberDiscount) {
-		this.vipmemberDiscount = vipmemberDiscount;
+	public void setDiscountAfterOrderAmount(BigDecimal discountAfterOrderAmount) {
+		this.discountAfterOrderAmount = discountAfterOrderAmount;
 	}
 
-	public BigDecimal getVipmemberDiscountRate() {
-		return vipmemberDiscountRate;
+	public BigDecimal getDiscountRate() {
+		return discountRate;
 	}
 
-	public void setVipmemberDiscountRate(BigDecimal vipmemberDiscountRate) {
-		this.vipmemberDiscountRate = vipmemberDiscountRate;
+	public void setDiscountRate(BigDecimal discountRate) {
+		this.discountRate = discountRate;
 	}
     
-
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderResourceBean.java

@@ -67,12 +67,6 @@ public class CourseOrderResourceBean {
      */
     private Double memberCashRebate; 
     
-    /**vip会员首次优惠*/
-    private Double vipFirstReduction;
-    /**vip会员随机最低优惠*/
-    private Double vipMinRandom;
-    /**vip会员随机最高优惠*/
-    private Double vipMaxRandom;
 
     public String getProductName() {
         return productName;
@@ -369,36 +363,4 @@ public class CourseOrderResourceBean {
         this.memberCashRebate = memberCashRebate;
     }
 
-
-	public Double getVipFirstReduction() {
-		return vipFirstReduction;
-	}
-
-
-	public void setVipFirstReduction(Double vipFirstReduction) {
-		this.vipFirstReduction = vipFirstReduction;
-	}
-
-
-	public Double getVipMinRandom() {
-		return vipMinRandom;
-	}
-
-
-	public void setVipMinRandom(Double vipMinRandom) {
-		this.vipMinRandom = vipMinRandom;
-	}
-
-
-	public Double getVipMaxRandom() {
-		return vipMaxRandom;
-	}
-
-
-	public void setVipMaxRandom(Double vipMaxRandom) {
-		this.vipMaxRandom = vipMaxRandom;
-	}
-    
-    
-
 }