parent: de8b71f1 | 补丁 | 提交 | ignore whitespace
yujian
2019-03-27 ae282f4d0b520b6e9c0617aa81034806008ebf80 
提现对象   清理 hibernate引入
5个文件已修改
211 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractRecord.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/PayInfo.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java


@@ -3,15 +3,8 @@


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.BusinessSystem;



@@ -23,18 +16,51 @@


 *



 * @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;



	


    @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;



@@ -42,37 +68,8 @@


    public Extract() {



    



    }







    @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 BusinessSystem system;







    @Column(name = "adminId")



    @Expose



    @org.yeshi.utils.mybatis.Column(name = "adminId")



    private Long adminId; // 任务id 目前默认值







	


	


    // TODO 等待添加字段



    private Date receiveTime;// 到账时间









 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractAuditRecord.java


@@ -1,15 +1,9 @@


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.entity.common.AdminUser;



@@ -21,65 +15,48 @@


 *



 * @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 // 风险等级





 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ExtractRecord.java


@@ -2,45 +2,30 @@






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;



/**



 * 每日的提现记录



 * @author cxx



 *



 * @date 2018年1月29日



 */



@Entity



@Table(name="yeshi_ec_extract_record")



@org.yeshi.utils.mybatis.Table("yeshi_ec_extract_record")



@Table("yeshi_ec_extract_record")



public class ExtractRecord {



    



    @org.yeshi.utils.mybatis.Column(name="id")



    @Id



    @GeneratedValue(strategy=GenerationType.AUTO)



    @Column(name="`id`")



    @Column(name="id")



    private Long id;



    



    @org.yeshi.utils.mybatis.Column(name="uid")



    @ManyToOne(fetch = FetchType.EAGER)



    @JoinColumn(name="uid")



    @Column(name="uid")



    private UserInfo userInfo;



    



    @org.yeshi.utils.mybatis.Column(name="count")



    @Column(name="count")



    private Integer count;







    @org.yeshi.utils.mybatis.Column(name="money")



    @Column(name="money")



    private BigDecimal money;



    



    @org.yeshi.utils.mybatis.Column(name="createTime")



    @Column(name="createTime")



    private Long createTime;



    



    public Long getId() {





 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/PayInfo.java


@@ -2,55 +2,39 @@






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;



/**



 * 支付宝转账结果记录



 * @author Administrator



 *



 */



@Entity



@Table(name = "`yeshi_ec_payinfo`")



@org.yeshi.utils.mybatis.Table("yeshi_ec_payinfo")



@Table("yeshi_ec_payinfo")



public class PayInfo {



    @org.yeshi.utils.mybatis.Column(name="id")



    @Id



    @GeneratedValue(strategy = GenerationType.AUTO)



	


    @Column(name = "id")



    private Long id;



    



	


    @org.yeshi.utils.mybatis.Column(name="eid")



    @ManyToOne(fetch = FetchType.EAGER)



    @JoinColumn(name = "`eid`")



    @Column(name = "eid")



    private Extract extract;



    



    



    @org.yeshi.utils.mybatis.Column(name="state")



    @Column(name = "state",length=2)



    @Column(name = "state")



    private Integer state; //转账状态  1.成功 2.失败 



    



    @org.yeshi.utils.mybatis.Column(name="info")



    @Column(name="info")



    private String info; //错误信息



    



    @org.yeshi.utils.mybatis.Column(name="biz_no")



    @Column(name = "biz_no")



    private String bizno; 



    



    @org.yeshi.utils.mybatis.Column(name="orderId")



    @Column(name="orderId")



    private String orderId;



    



    @org.yeshi.utils.mybatis.Column(name="createtime")



    @Column(name="createtime")



    private Date createtime;



    



    @org.yeshi.utils.mybatis.Column(name="ordertime")



    @Column(name="ordertime")



    private String ordertime;







    public Long getId() {





 fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml


@@ -74,7 +74,7 @@


        #{state,jdbcType=INTEGER},



        #{type,jdbcType=INTEGER},



        #{userInfo.id,jdbcType=BIGINT},



        #{system.id,jdbcType=BIGINT}



        #{system.id,jdbcType=BIGINT},



        #{adminId,jdbcType=BIGINT},



        #{receiveTime,jdbcType=TIMESTAMP}



        )