From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
index 5066338..ead0b54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
@@ -29,13 +29,17 @@
     // 瀹為檯鎬绘暟閲�
  	private Integer totalCount;
  	// 瀹為檯鎬讳粯娆�
- 	private BigDecimal totalSettlement;
+ 	private BigDecimal totalPayment;
+    // 瀹為檯鎬荤粨绠�
+  	private BigDecimal totalSettlement;
  	// 绾㈠寘绫诲瀷锛�
  	private Integer hongBaoType;
     // 璁㈠崟鎬婚浼板閲�
  	private BigDecimal hongBao;
  	
- 	
+ 	//   1 娣樺疂 2 澶╃尗
+  	@Expose
+    private Integer orderType;
  	// 绾㈠寘鐘舵��
  	@Expose
     private Integer hongBaoState;
@@ -45,6 +49,9 @@
 	// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
  	@Expose
  	private String hongBaoTypePic;
+ 	// 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+  	@Expose
+    private String orderOrigin;
 	// 璁㈠崟鐘舵��
  	@Expose
     private Map<String, String> orderState;
@@ -53,7 +60,7 @@
     private Map<String, String> hongBaoInfo;
 	// 鍒拌处鐘舵��
  	@Expose
-    private String accountState;
+ 	private Map<String, String> accountState;
     // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
     @Expose
     private Long obtainTime;
@@ -189,13 +196,38 @@
 		this.hongBaoDate = hongBaoDate;
 	}
 
-	public String getAccountState() {
+
+	public Integer getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+
+	public Map<String, String> getAccountState() {
 		return accountState;
 	}
 
-	public void setAccountState(String accountState) {
+	public void setAccountState(Map<String, String> accountState) {
 		this.accountState = accountState;
 	}
 
+	public String getOrderOrigin() {
+		return orderOrigin;
+	}
+
+	public void setOrderOrigin(String orderOrigin) {
+		this.orderOrigin = orderOrigin;
+	}
+
+	public BigDecimal getTotalPayment() {
+		return totalPayment;
+	}
+
+	public void setTotalPayment(BigDecimal totalPayment) {
+		this.totalPayment = totalPayment;
+	}
+
     
 }

--
Gitblit v1.8.0