Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 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;

   }

   

   

}