From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
index ce0ccdc..da989e8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
@@ -26,6 +26,11 @@
public final static int STATE_WQ = 3;
public final static int STATE_SX = 4;
+ // 鏁翠釜璁㈠崟鐘舵�� 1-鏈夋晥 2-閮ㄥ垎鏈夋晥/澶辨晥 3-澶辨晥
+ public final static int STATE_WHOLE_ORDER_YOUXIAO = 1;
+ public final static int STATE_WHOLE_ORDER_BUFENYOUXIAO = 2;
+ public final static int STATE_WHOLE_ORDER_SHIXIAO = 3;
+
// 璁㈠崟绾㈠寘绫诲瀷鍥剧墖
public final static String TYPE_FANLI = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_fanli.png";
public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";
@@ -66,6 +71,11 @@
@Column(name = "co_state")
private Integer state;
+ // 鏁翠釜璁㈠崟鐘舵�侊細鏈夋晥 銆� 閮ㄥ垎鏈夋晥/澶辨晥 銆� 澶辨晥
+ @Expose
+ @Column(name = "co_state_whole_order")
+ private Integer stateWholeOrder;
+
// 鏁堟灉棰勪及
@Column(name = "co_estimate")
private BigDecimal estimate;
@@ -92,6 +102,9 @@
@Column(name = "co_order_by")
private Integer orderBy;// 瀛愯鍗曠殑鎺掑簭鍊�
+
+ @Column(name = "co_trade_id")
+ private String tradeId;
// 鍒涘缓鏃堕棿
@Column(name = "co_create_time")
@@ -245,4 +258,20 @@
this.updateTime = updateTime;
}
+ public Integer getStateWholeOrder() {
+ return stateWholeOrder;
+ }
+
+ public void setStateWholeOrder(Integer stateWholeOrder) {
+ this.stateWholeOrder = stateWholeOrder;
+ }
+
+ public String getTradeId() {
+ return tradeId;
+ }
+
+ public void setTradeId(String tradeId) {
+ this.tradeId = tradeId;
+ }
+
}
--
Gitblit v1.8.0