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/ExtractAuditRecord.java |  383 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 198 insertions(+), 185 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java
index 8d6a9fd..c8c3a65 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java
@@ -1,185 +1,198 @@
-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.common.AdminUser;
-
-/**
- * 鎻愮幇瀹℃壒璁板綍
- * 
- * @author yj
- *
- * @date 2018骞�6鏈�14鏃�
- */
-@Entity
-@Table(name = "yeshi_ec_extract_audit_record")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_extract_audit_record")
-public class ExtractAuditRecord {
-	@Id
-	@Column(name = "`id`")
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@org.yeshi.utils.mybatis.Column(name="id")
-	private Long id;
-	
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "aid")
-	@org.yeshi.utils.mybatis.Column(name="aid")
-	private AdminUser adminUser;// 瀹℃牳鐢ㄦ埛
-
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "extractId")
-	@org.yeshi.utils.mybatis.Column(name="extractId")
-	private Extract extract; // 鐢宠璁板綍id
-	
-
-	@Column(name = "beforeMoney")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="beforeMoney")
-	private BigDecimal beforeMoney;// 鎻愮幇涔嬪墠浣欓
-
-	@Column(name = "afterMoney")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="afterMoney")
-	private BigDecimal afterMoney;// 鎻愮幇涔嬪悗浣欓
-
-	@Column(name = "countMoney")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="countMoney")
-	private BigDecimal countMoney;// 绱鎻愮幇閲戦
-
-	@Column(name = "countNum")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="countNum")
-	private Long countNum; // 绱鎻愮幇娆℃暟
-
-	@Column(name = "`auditTime`")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name = "auditTime")
-	private Long auditTime;// 瀹℃牳鏃堕棿
-	
-	@Column(name = "orderNum")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="orderNum")
-	private Long orderNum; // 绱鎻愮幇娆℃暟
-	
-	@Column(name = "cancelOrderNum")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="cancelOrderNum")
-	private Long cancelOrderNum; // 缁存潈璁㈠崟
-	
-	@Column(name = "auditRole")
-	@Expose
-	@org.yeshi.utils.mybatis.Column(name="auditRole")
-	private String auditRole; //瀹℃牳浜�
-	
-	@Expose // 椋庨櫓绛夌骇
-	private int warnLevel;
-	
-	public String getAuditRole() {
-		return auditRole;
-	}
-
-	public void setAuditRole(String auditRole) {
-		this.auditRole = auditRole;
-	}
-
-	public Long getCancelOrderNum() {
-		return cancelOrderNum;
-	}
-
-	public void setCancelOrderNum(Long cancelOrderNum) {
-		this.cancelOrderNum = cancelOrderNum;
-	}
-
-	public Long getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(Long orderNum) {
-		this.orderNum = orderNum;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public AdminUser getAdminUser() {
-		return adminUser;
-	}
-
-	public void setAdminUser(AdminUser adminUser) {
-		this.adminUser = adminUser;
-	}
-
-	public Extract getExtract() {
-		return extract;
-	}
-
-	public void setExtract(Extract extract) {
-		this.extract = extract;
-	}
-
-	public BigDecimal getBeforeMoney() {
-		return beforeMoney;
-	}
-
-	public void setBeforeMoney(BigDecimal beforeMoney) {
-		this.beforeMoney = beforeMoney;
-	}
-
-	public BigDecimal getAfterMoney() {
-		return afterMoney;
-	}
-
-	public void setAfterMoney(BigDecimal afterMoney) {
-		this.afterMoney = afterMoney;
-	}
-
-	public BigDecimal getCountMoney() {
-		return countMoney;
-	}
-
-	public void setCountMoney(BigDecimal countMoney) {
-		this.countMoney = countMoney;
-	}
-
-	public Long getCountNum() {
-		return countNum;
-	}
-
-	public void setCountNum(Long countNum) {
-		this.countNum = countNum;
-	}
-
-	public Long getAuditTime() {
-		return auditTime;
-	}
-
-	public void setAuditTime(Long auditTime) {
-		this.auditTime = auditTime;
-	}
-
-	public int getWarnLevel() {
-		return warnLevel;
-	}
-
-	public void setWarnLevel(int warnLevel) {
-		this.warnLevel = warnLevel;
-	}
-	
-	
-}
+package com.yeshi.fanli.entity.bus.user;
+
+import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
+import com.yeshi.fanli.entity.common.AdminUser;
+
+/**
+ * 鎻愮幇瀹℃壒璁板綍
+ * 
+ * @author yj
+ *
+ * @date 2018骞�6鏈�14鏃�
+ */
+@Table("yeshi_ec_extract_audit_record")
+public class ExtractAuditRecord {
+	
+	@Column(name = "id")
+	private Long id;
+	
+	@Column(name = "aid")
+	private AdminUser adminUser;// 瀹℃牳鐢ㄦ埛
+
+	@Column(name = "extractId")
+	private Extract extract; // 鐢宠璁板綍id
+
+	@Expose
+	@Column(name = "beforeMoney")
+	private BigDecimal beforeMoney;// 鎻愮幇涔嬪墠浣欓
+
+	@Expose
+	@Column(name = "afterMoney")
+	private BigDecimal afterMoney;// 鎻愮幇涔嬪悗浣欓
+
+	@Expose
+	@Column(name = "countMoney")
+	private BigDecimal countMoney;// 绱鎻愮幇閲戦
+
+	@Expose
+	@Column(name = "countNum")
+	private Long countNum; // 绱鎻愮幇娆℃暟
+
+	@Expose
+	@Column(name = "auditTime")
+	private Long auditTime;// 瀹℃牳鏃堕棿
+	
+	@Expose
+	@Column(name = "orderNum")
+	private Long orderNum; // 绱鎻愮幇娆℃暟
+	
+	@Expose
+	@Column(name = "cancelOrderNum")
+	private Long cancelOrderNum; // 缁存潈璁㈠崟
+	
+	@Expose
+	@Column(name = "auditRole")
+	private String auditRole; //瀹℃牳浜�
+	
+	@Expose // 椋庨櫓绛夌骇
+	private int warnLevel;
+	
+	@Expose
+	private ExtractOrderStatisticDTO extraInfo;//extraInfoStr瀵硅薄
+	
+	@Column(name = "extraInfo")
+	private String extraInfoStr;//闄勫姞淇℃伅JSON鏍煎紡
+
+	@Transient
+	@Expose
+	private String system;//绯荤粺鍚嶇О
+
+	public String getSystem() {
+		return system;
+	}
+
+	public void setSystem(String system) {
+		this.system = system;
+	}
+
+	public ExtractOrderStatisticDTO getExtraInfo() {
+		return extraInfo;
+	}
+
+	public void setExtraInfo(ExtractOrderStatisticDTO extraInfo) {
+		this.extraInfo = extraInfo;
+	}
+
+	public String getExtraInfoStr() {
+		return extraInfoStr;
+	}
+
+	public void setExtraInfoStr(String extraInfoStr) {
+		this.extraInfoStr = extraInfoStr;
+	}
+
+	public String getAuditRole() {
+		return auditRole;
+	}
+
+	public void setAuditRole(String auditRole) {
+		this.auditRole = auditRole;
+	}
+
+	public Long getCancelOrderNum() {
+		return cancelOrderNum;
+	}
+
+	public void setCancelOrderNum(Long cancelOrderNum) {
+		this.cancelOrderNum = cancelOrderNum;
+	}
+
+	public Long getOrderNum() {
+		return orderNum;
+	}
+
+	public void setOrderNum(Long orderNum) {
+		this.orderNum = orderNum;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public AdminUser getAdminUser() {
+		return adminUser;
+	}
+
+	public void setAdminUser(AdminUser adminUser) {
+		this.adminUser = adminUser;
+	}
+
+	public Extract getExtract() {
+		return extract;
+	}
+
+	public void setExtract(Extract extract) {
+		this.extract = extract;
+	}
+
+	public BigDecimal getBeforeMoney() {
+		return beforeMoney;
+	}
+
+	public void setBeforeMoney(BigDecimal beforeMoney) {
+		this.beforeMoney = beforeMoney;
+	}
+
+	public BigDecimal getAfterMoney() {
+		return afterMoney;
+	}
+
+	public void setAfterMoney(BigDecimal afterMoney) {
+		this.afterMoney = afterMoney;
+	}
+
+	public BigDecimal getCountMoney() {
+		return countMoney;
+	}
+
+	public void setCountMoney(BigDecimal countMoney) {
+		this.countMoney = countMoney;
+	}
+
+	public Long getCountNum() {
+		return countNum;
+	}
+
+	public void setCountNum(Long countNum) {
+		this.countNum = countNum;
+	}
+
+	public Long getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Long auditTime) {
+		this.auditTime = auditTime;
+	}
+
+	public int getWarnLevel() {
+		return warnLevel;
+	}
+
+	public void setWarnLevel(int warnLevel) {
+		this.warnLevel = warnLevel;
+	}
+	
+	
+}

--
Gitblit v1.8.0