From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 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 da989e8..d09d419 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
@@ -36,6 +36,9 @@
public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";
public final static String TYPE_SHARE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_share.png";
+ public final static int ORDER_TYPE_ZIGOU = 1;// 鑷喘
+ public final static int ORDER_TYPE_SHARE = 20;// 鍒嗕韩
+
@Column(name = "co_id")
private Long id;
@@ -106,6 +109,10 @@
@Column(name = "co_trade_id")
private String tradeId;
+ // 鐘舵�佽鏄�
+ @Column(name = "co_state_desc")
+ private String stateDesc;
+
// 鍒涘缓鏃堕棿
@Column(name = "co_create_time")
private Date createTime;
@@ -113,6 +120,28 @@
// 鏇存柊鏃堕棿
@Column(name = "co_update_time")
private Date updateTime;
+
+ @Column(name = "co_urank")
+ private Integer urank;// 鐢ㄦ埛绛夌骇 100-涓鸿秴绾т細鍛�
+
+ @Column(name = "co_child_source_type")
+ private String childSourceType;// 瀛愭潵婧愮被鍨�
+
+ public String getChildSourceType() {
+ return childSourceType;
+ }
+
+ public void setChildSourceType(String childSourceType) {
+ this.childSourceType = childSourceType;
+ }
+
+ public Integer getUrank() {
+ return urank;
+ }
+
+ public void setUrank(Integer urank) {
+ this.urank = urank;
+ }
public CommonOrder() {
@@ -274,4 +303,12 @@
this.tradeId = tradeId;
}
+ public String getStateDesc() {
+ return stateDesc;
+ }
+
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
+
}
--
Gitblit v1.8.0