线下制单

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

@@ -111,6 +111,14 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
      * 推荐人uid
      */
     private String recommendUid;
+    
+
+
+	private int isConfirm;
+	
+	private BigDecimal needPayMoney;
+
+
 
 	// ------------------
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -613,4 +621,20 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
 	public void setRecommendUid(String recommendUid) {
 		this.recommendUid = recommendUid;
 	}    
+	
+    public int getIsConfirm() {
+		return isConfirm;
+	}
+
+	public void setIsConfirm(int isConfirm) {
+		this.isConfirm = isConfirm;
+	}
+	
+	public BigDecimal getNeedPayMoney() {
+		return needPayMoney;
+	}
+
+	public void setNeedPayMoney(BigDecimal needPayMoney) {
+		this.needPayMoney = needPayMoney;
+	}
 }

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

@@ -93,8 +93,13 @@ public class AbstractOrderListBean {
      * 携程支付订单编号
      */
     private String outTradeId;
+    
+    private Integer isConfirm;
+
+	private BigDecimal PrePayAmount;
+   
 
-    public InvoiceBean getInvoice() {
+	public InvoiceBean getInvoice() {
 		return invoice;
 	}
 
@@ -402,5 +407,21 @@ public class AbstractOrderListBean {
 	public void setPlatform(String platform) {
 		this.platform = platform;
 	}
+	
+	public Integer getIsConfirm() {
+		return isConfirm;
+	}
+
+	public void setIsConfirm(Integer isConfirm) {
+		this.isConfirm = isConfirm;
+	}
+	
+    public BigDecimal getPrePayAmount() {
+		return PrePayAmount;
+	}
+
+	public void setPrePayAmount(BigDecimal prePayAmount) {
+		PrePayAmount = prePayAmount;
+	}
 
 }

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

@@ -24,7 +24,11 @@ public class AbstractOrderListItemBean {
     private String uid;
     private String payMode;
     private BigDecimal amount;
-    private BigDecimal totalAmount;
+ 
+	private BigDecimal PrePayCardAmount;
+    private BigDecimal VoucherAmount;
+	private BigDecimal totalAmount;
+	private BigDecimal ActualAmount;
     private Date orderDate;
     private Integer isThird;
     private Integer confirmType;
@@ -34,8 +38,10 @@ public class AbstractOrderListItemBean {
     /**正常下单后优惠的价格，不是一开始就知道的 优惠价格*/
     private BigDecimal discountAfterOrderAmount;
     private String teeTime;
-    
-    public Integer getOrderType() {
+    private Integer isConfirm;
+    private BigDecimal PrePayAmount;
+  
+	public Integer getOrderType() {
         return orderType;
     }
 
@@ -180,4 +186,45 @@ public class AbstractOrderListItemBean {
 	public void setTeeTime(String teeTime) {
 		this.teeTime = teeTime;
 	}
+	public Integer getIsConfirm() {
+		return isConfirm;
+	}
+
+	public void setIsConfirm(Integer isConfirm) {
+		this.isConfirm = isConfirm;
+	}
+	
+    public BigDecimal getPrePayCardAmount() {
+		return PrePayCardAmount;
+	}
+
+	public void setPrePayCardAmount(BigDecimal prePayCardAmount) {
+		PrePayCardAmount = prePayCardAmount;
+	}
+	
+
+	public BigDecimal getVoucherAmount() {
+		return VoucherAmount;
+	}
+
+	public void setVoucherAmount(BigDecimal voucherAmount) {
+		VoucherAmount = voucherAmount;
+	}
+	
+   public BigDecimal getActualAmount() {
+		return ActualAmount;
+	}
+
+	public void setActualAmount(BigDecimal actualAmount) {
+		ActualAmount = actualAmount;
+	}
+	public BigDecimal getPrePayAmount() {
+		return PrePayAmount;
+	}
+
+	public void setPrePayAmount(BigDecimal prePayAmount) {
+		PrePayAmount = prePayAmount;
+	}
+
+
 }

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

@@ -24,8 +24,18 @@ public class OrderQuery extends AbstractPagedQuery {
     
     private String token;
     private String imageSize;
+    
+    private Integer isMp = 0;
+
+    public Integer getIsMp() {
+		return isMp;
+	}
+
+	public void setIsMp(Integer isMp) {
+		this.isMp = isMp;
+	}
 
-    public long getOrderNo() {
+	public long getOrderNo() {
         return orderNo;
     }