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/Extract.java | 72 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java
index 2f60f85..a496f54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java
@@ -1,19 +1,13 @@
package com.yeshi.fanli.entity.bus.user;
import java.math.BigDecimal;
+import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-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 org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
/**
* 鎻愮幇璁板綍
@@ -22,48 +16,70 @@
*
* @date 2018骞�1鏈�29鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_extract")
+@Table("yeshi_ec_extract")
public class Extract {
public static int STATE_NOT_PROCESS = 0;// 鏈鐞�
public static int STATE_PASS = 1;// 閫氳繃
public static int STATE_REJECT = 2;// 鎷掔粷
public static int STATE_PROCESSING = 3;// 姝ｅ湪澶勭悊
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "`id`")
+ @Column(name = "id")
private Long id;
-
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "uid")
- @org.yeshi.utils.mybatis.Column(name = "uid")
+
+ @Column(name = "uid")
private UserInfo userInfo;// 鐢ㄦ埛
+
+ @Column(name = "sid")
+ private BusinessSystem system;
+ @Expose
+ @Column(name = "adminId")
+ private Long adminId; // 浠诲姟id 鐩墠榛樿鍊�
+
+ @Column(name = "account")
private String account;// 搴勬埛
+ @Column(name = "name")
private String name;// 鎻愮幇鍚嶇О
+ @Column(name = "type")
private Integer type;// 鎻愮幇绫诲瀷
+ @Column(name = "money")
private BigDecimal money;// 鎻愮幇閲戦
+ @Column(name = "extractTime")
private Long extractTime;
+ @Column(name = "ip")
private String ip;
+ @Column(name = "state")
private Integer state;
+ @Column(name = "reason")
private String reason;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sid")
- private System system;
+
- @Column(name = "adminId")
- @Expose
- @org.yeshi.utils.mybatis.Column(name = "adminId")
- private Long adminId; // 浠诲姟id 鐩墠榛樿鍊�
+ public Extract(Long id) {
+ this.id = id;
+ }
+ public Extract() {
+
+ }
+
+
+ // TODO 绛夊緟娣诲姞瀛楁
+ private Date receiveTime;// 鍒拌处鏃堕棿
+
+ public Date getReceiveTime() {
+ return receiveTime;
+ }
+
+ public void setReceiveTime(Date receiveTime) {
+ this.receiveTime = receiveTime;
+ }
public Long getAdminId() {
return adminId;
@@ -73,11 +89,11 @@
this.adminId = adminId;
}
- public System getSystem() {
+ public BusinessSystem getSystem() {
return system;
}
- public void setSystem(System system) {
+ public void setSystem(BusinessSystem system) {
this.system = system;
}
--
Gitblit v1.8.0