From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java |   80 +++++++++++++++++++++++++++++++--------
 1 files changed, 63 insertions(+), 17 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 5d49bad..2badbad 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
@@ -1,14 +1,14 @@
 package com.yeshi.fanli.entity.bus.user;
 
-import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
 
 import com.google.gson.annotations.Expose;
 
@@ -19,58 +19,72 @@
  *
  * @date 2018骞�1鏈�29鏃�
  */
-@Entity
-@Table(name = "yeshi_ec_lost_order")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_lost_order")
+@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鏃ユ湭澶勭悊鎴愬姛鍒欏垽鏂负澶辫触锛�
 
+	public final static int STATE_VERFING = 0;
+	public final static int STATE_PASS = 1;
+	public final static int STATE_REJECT = 2;
+	
+	
+	public final static int TYPE_TAOBAO = 1;
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Expose
-	@Column(name="id")
+	@Column(name = "id")
 	private Long id;
 	@Expose
-	@Column(name="orderId")
+	@Column(name = "orderId")
 	private String orderId;// 璁㈠崟鍙�
-	@Column(name="type")
+	@Column(name = "type")
 	@Expose
 	private Integer type;// 璁㈠崟绫诲瀷 1-娣樺疂璁㈠崟
-	@Column(name="state")
+	@Column(name = "state")
 	@Expose
 	private Integer state;// 璁㈠崟鐘舵�� 0:瀹℃牳 1锛氶�氳繃 2锛氭嫆缁�
-	@Column(name="createTime")
+	@Column(name = "createTime")
 	@Expose
 	private Long createTime;
-	@Column(name="handleTime")
+	@Column(name = "handleTime")
 	@Expose
 	private Long handleTime;
 
-	@Column(name="uid")
+	@Column(name = "uid")
 	@ManyToOne
 	@JoinColumn(name = "uid")
 	@Expose
 	private UserInfo userInfo;
 
-	@Column(name="oid")
+	@Column(name = "oid")
 	@ManyToOne
 	@JoinColumn(name = "oid")
 	@Expose
 	private Order order;
-	@Column(name="remake")
+	@Column(name = "remake")
 	@Expose
 	private String remake;
-	@Column(name="judge")
+	@Column(name = "judge")
 	@Expose
 	private String judge;// 绯荤粺鍒ゅ畾锛氬鏋滅敤鎴峰湪鏈郴缁熻喘涔板苟鎴愬姛涓婁紶杩囪鍗曪紝涓斾笂浼犵殑涓㈠け璁㈠崟鍚�6浣嶇浉鍚岀殑璇濓紝閭ｄ箞绯荤粺鍒ゅ畾涓哄尮閰�
 
-	@Column(name="result_code")
-	@javax.persistence.Column(name="result_code")
+	@Column(name = "result_code")
+	@javax.persistence.Column(name = "result_code")
 	@Expose
 	private Integer resultCode;// 绗笁鏂瑰钩鍙拌鍗曠埇鍙栫粨鏋�
+	@Column(name = "ip_info")
+	private String ipInfo;
+
+	@Transient
+	private Integer total;
+	@Transient
+	private Integer totalPass;
+	@Transient
+	private Integer totalReject;
 
 	public Integer getResultCode() {
 		return resultCode;
@@ -160,4 +174,36 @@
 		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;
+	}
+
+	public String getIpInfo() {
+		return ipInfo;
+	}
+
+	public void setIpInfo(String ipInfo) {
+		this.ipInfo = ipInfo;
+	}
+
 }

--
Gitblit v1.8.0