From 89e89fe2b2a1578a94b2e2c8ee81efbfbbf85f08 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 14:18:42 +0800
Subject: [PATCH] 兑换邀请码调整
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 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 9846ce6..4e8654d 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,17 +1,12 @@
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 org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
import com.yeshi.fanli.entity.common.AdminUser;
/**
@@ -21,68 +16,75 @@
*
* @date 2018骞�6鏈�14鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_extract_audit_record")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_extract_audit_record")
+@Table("yeshi_ec_extract_audit_record")
public class ExtractAuditRecord {
- @Id
- @Column(name = "`id`")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name="id")
+
+ @Column(name = "id")
private Long id;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "aid")
- @org.yeshi.utils.mybatis.Column(name="aid")
+ @Column(name = "aid")
private AdminUser adminUser;// 瀹℃牳鐢ㄦ埛
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "extractId")
- @org.yeshi.utils.mybatis.Column(name="extractId")
+ @Column(name = "extractId")
private Extract extract; // 鐢宠璁板綍id
-
- @Column(name = "beforeMoney")
@Expose
- @org.yeshi.utils.mybatis.Column(name="beforeMoney")
+ @Column(name = "beforeMoney")
private BigDecimal beforeMoney;// 鎻愮幇涔嬪墠浣欓
- @Column(name = "afterMoney")
@Expose
- @org.yeshi.utils.mybatis.Column(name="afterMoney")
+ @Column(name = "afterMoney")
private BigDecimal afterMoney;// 鎻愮幇涔嬪悗浣欓
- @Column(name = "countMoney")
@Expose
- @org.yeshi.utils.mybatis.Column(name="countMoney")
+ @Column(name = "countMoney")
private BigDecimal countMoney;// 绱鎻愮幇閲戦
- @Column(name = "countNum")
@Expose
- @org.yeshi.utils.mybatis.Column(name="countNum")
+ @Column(name = "countNum")
private Long countNum; // 绱鎻愮幇娆℃暟
- @Column(name = "`auditTime`")
@Expose
- @org.yeshi.utils.mybatis.Column(name = "auditTime")
+ @Column(name = "auditTime")
private Long auditTime;// 瀹℃牳鏃堕棿
- @Column(name = "orderNum")
@Expose
- @org.yeshi.utils.mybatis.Column(name="orderNum")
+ @Column(name = "orderNum")
private Long orderNum; // 绱鎻愮幇娆℃暟
- @Column(name = "cancelOrderNum")
@Expose
- @org.yeshi.utils.mybatis.Column(name="cancelOrderNum")
+ @Column(name = "cancelOrderNum")
private Long cancelOrderNum; // 缁存潈璁㈠崟
- @Column(name = "auditRole")
@Expose
- @org.yeshi.utils.mybatis.Column(name="auditRole")
+ @Column(name = "auditRole")
private String auditRole; //瀹℃牳浜�
+ @Expose // 椋庨櫓绛夌骇
+ private int warnLevel;
+ @Expose
+ private ExtractOrderStatisticDTO extraInfo;//extraInfoStr瀵硅薄
+
+ @Column(name = "extraInfo")
+ private String extraInfoStr;//闄勫姞淇℃伅JSON鏍煎紡
+
+ 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;
}
@@ -170,6 +172,14 @@
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