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/bus/user/LostOrder.java | 32 +++++++++++++++-----------------
1 files changed, 15 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 d1dc506..e7ce9a7 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,15 +1,9 @@
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;
@@ -20,9 +14,7 @@
*
* @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;// 瀹℃牳涓�
@@ -32,9 +24,10 @@
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")
private Long id;
@@ -55,14 +48,10 @@
private Long handleTime;
@Column(name = "uid")
- @ManyToOne
- @JoinColumn(name = "uid")
@Expose
private UserInfo userInfo;
@Column(name = "oid")
- @ManyToOne
- @JoinColumn(name = "oid")
@Expose
private Order order;
@Column(name = "remake")
@@ -73,9 +62,10 @@
private String judge;// 绯荤粺鍒ゅ畾锛氬鏋滅敤鎴峰湪鏈郴缁熻喘涔板苟鎴愬姛涓婁紶杩囪鍗曪紝涓斾笂浼犵殑涓㈠け璁㈠崟鍚�6浣嶇浉鍚岀殑璇濓紝閭ｄ箞绯荤粺鍒ゅ畾涓哄尮閰�
@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;
@@ -196,4 +186,12 @@
this.totalReject = totalReject;
}
+ public String getIpInfo() {
+ return ipInfo;
+ }
+
+ public void setIpInfo(String ipInfo) {
+ this.ipInfo = ipInfo;
+ }
+
}
--
Gitblit v1.8.0