From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java | 92 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java
index 6cc9035..cdf2605 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java
@@ -7,47 +7,88 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.yeshi.utils.mybatis.Column;
import com.google.gson.annotations.Expose;
+
/**
* 涓㈠け璁㈠崟
+ *
* @author cxx
*
* @date 2018骞�1鏈�29鏃�
*/
@Entity
-@Table(name="yeshi_ec_lost_order")
+@Table(name = "yeshi_ec_lost_order")
+@org.yeshi.utils.mybatis.Table("yeshi_ec_lost_order")
public class LostOrder {
-
+
+ public final static int RESULT_CODE_VERFING = 1;// 瀹℃牳涓�
+ public final static int RESULT_CODE_SUCCESS = 2;// 鎴愬姛
+ public final static int RESULT_CODE_FAIL = 3;// 澶辫触锛堥�氳繃鍚�3鏃ユ湭澶勭悊鎴愬姛鍒欏垽鏂负澶辫触锛�
+
@Id
- @GeneratedValue(strategy=GenerationType.AUTO)
+ @GeneratedValue(strategy = GenerationType.AUTO)
@Expose
+ @Column(name="id")
private Long id;
@Expose
- private String orderId;//璁㈠崟鍙�
+ @Column(name="orderId")
+ private String orderId;// 璁㈠崟鍙�
+ @Column(name="type")
@Expose
- private Integer type;//璁㈠崟绫诲瀷
+ private Integer type;// 璁㈠崟绫诲瀷 1-娣樺疂璁㈠崟
+ @Column(name="state")
@Expose
- private Integer state;//璁㈠崟鐘舵�� 0:瀹℃牳 1锛氶�氳繃 2锛氭嫆缁�
+ private Integer state;// 璁㈠崟鐘舵�� 0:瀹℃牳 1锛氶�氳繃 2锛氭嫆缁�
+ @Column(name="createTime")
@Expose
private Long createTime;
+ @Column(name="handleTime")
@Expose
private Long handleTime;
-
+
+ @Column(name="uid")
@ManyToOne
- @JoinColumn(name="uid")
+ @JoinColumn(name = "uid")
@Expose
private UserInfo userInfo;
-
+
+ @Column(name="oid")
@ManyToOne
- @JoinColumn(name="oid")
+ @JoinColumn(name = "oid")
@Expose
private Order order;
+ @Column(name="remake")
@Expose
private String remake;
+ @Column(name="judge")
@Expose
- private String judge;//绯荤粺鍒ゅ畾锛氬鏋滅敤鎴峰湪鏈郴缁熻喘涔板苟鎴愬姛涓婁紶杩囪鍗曪紝涓斾笂浼犵殑涓㈠け璁㈠崟鍚�6涓虹浉鍚岀殑璇濓紝閭ｄ箞绯荤粺鍒ゅ畾涓哄尮閰�
+ private String judge;// 绯荤粺鍒ゅ畾锛氬鏋滅敤鎴峰湪鏈郴缁熻喘涔板苟鎴愬姛涓婁紶杩囪鍗曪紝涓斾笂浼犵殑涓㈠け璁㈠崟鍚�6浣嶇浉鍚岀殑璇濓紝閭ｄ箞绯荤粺鍒ゅ畾涓哄尮閰�
+
+ @Column(name="result_code")
+ @javax.persistence.Column(name="result_code")
+ @Expose
+ private Integer resultCode;// 绗笁鏂瑰钩鍙拌鍗曠埇鍙栫粨鏋�
+
+ @Transient
+ private Integer total;
+ @Transient
+ private Integer totalPass;
+ @Transient
+ private Integer totalReject;
+
+ public Integer getResultCode() {
+ return resultCode;
+ }
+
+ public void setResultCode(Integer resultCode) {
+ this.resultCode = resultCode;
+ }
+
public Long getId() {
return id;
}
@@ -55,7 +96,7 @@
public void setId(Long id) {
this.id = id;
}
-
+
public String getRemake() {
return remake;
}
@@ -63,7 +104,7 @@
public void setRemake(String remake) {
this.remake = remake;
}
-
+
public String getJudge() {
return judge;
}
@@ -127,6 +168,29 @@
public void setOrder(Order order) {
this.order = order;
}
-
+
+ public Integer getTotal() {
+ return total;
+ }
+
+ public void setTotal(Integer total) {
+ this.total = total;
+ }
+
+ public Integer getTotalPass() {
+ return totalPass;
+ }
+
+ public void setTotalPass(Integer totalPass) {
+ this.totalPass = totalPass;
+ }
+
+ public Integer getTotalReject() {
+ return totalReject;
+ }
+
+ public void setTotalReject(Integer totalReject) {
+ this.totalReject = totalReject;
+ }
}
--
Gitblit v1.8.0