From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java |  344 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 180 insertions(+), 164 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..366ed68 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,164 +1,180 @@
-package com.yeshi.fanli.entity.bus.user;
-
-import java.math.BigDecimal;
-
-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 com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
-
-/**
- * 鎻愮幇璁板綍
- * 
- * @author cxx
- *
- * @date 2018骞�1鏈�29鏃�
- */
-@Entity
-@Table(name = "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;// 姝e湪澶勭悊
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "`id`")
-	private Long id;
-
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "uid")
-	@org.yeshi.utils.mybatis.Column(name = "uid")
-	private UserInfo userInfo;// 鐢ㄦ埛
-
-	private String account;// 搴勬埛
-
-	private String name;// 鎻愮幇鍚嶇О
-
-	private Integer type;// 鎻愮幇绫诲瀷
-
-	private BigDecimal money;// 鎻愮幇閲戦
-
-	private Long extractTime;
-
-	private String ip;
-
-	private Integer state;
-
-	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 Long getAdminId() {
-		return adminId;
-	}
-
-	public void setAdminId(Long adminId) {
-		this.adminId = adminId;
-	}
-
-	public System getSystem() {
-		return system;
-	}
-
-	public void setSystem(System system) {
-		this.system = system;
-	}
-
-	public String getReason() {
-		return reason;
-	}
-
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getExtractTime() {
-		return extractTime;
-	}
-
-	public void setExtractTime(Long extractTime) {
-		this.extractTime = extractTime;
-	}
-
-	public String getIp() {
-		return ip;
-	}
-
-	public void setIp(String ip) {
-		this.ip = ip;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public UserInfo getUserInfo() {
-		return userInfo;
-	}
-
-	public void setUserInfo(UserInfo userInfo) {
-		this.userInfo = userInfo;
-	}
-
-	public String getAccount() {
-		return account;
-	}
-
-	public void setAccount(String account) {
-		this.account = account;
-	}
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	public BigDecimal getMoney() {
-		return money;
-	}
-
-	public void setMoney(BigDecimal money) {
-		this.money = money;
-	}
-
-}
+package com.yeshi.fanli.entity.bus.user;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+
+/**
+ * 鎻愮幇璁板綍
+ * 
+ * @author cxx
+ *
+ * @date 2018骞�1鏈�29鏃�
+ */
+@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;// 姝e湪澶勭悊
+
+	@Column(name = "id")
+	private Long id;
+	
+	@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;
+
+	
+
+	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;
+	}
+
+	public void setAdminId(Long adminId) {
+		this.adminId = adminId;
+	}
+
+	public BusinessSystem getSystem() {
+		return system;
+	}
+
+	public void setSystem(BusinessSystem system) {
+		this.system = system;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getExtractTime() {
+		return extractTime;
+	}
+
+	public void setExtractTime(Long extractTime) {
+		this.extractTime = extractTime;
+	}
+
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public UserInfo getUserInfo() {
+		return userInfo;
+	}
+
+	public void setUserInfo(UserInfo userInfo) {
+		this.userInfo = userInfo;
+	}
+
+	public String getAccount() {
+		return account;
+	}
+
+	public void setAccount(String account) {
+		this.account = account;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public BigDecimal getMoney() {
+		return money;
+	}
+
+	public void setMoney(BigDecimal money) {
+		this.money = money;
+	}
+
+}

--
Gitblit v1.8.0