fanli-server.git

			@@ -3,6 +3,10 @@
			import java.math.BigDecimal;
			import java.util.Date;

			import org.yeshi.utils.mybatis.Column;
			import org.yeshi.utils.mybatis.Table;

			import com.google.gson.annotations.Expose;
			import com.yeshi.fanli.entity.bus.user.UserInfo;

			/**
			@@ -11,22 +15,16 @@
			* @author Administrator
			*
			*/
			@Table("yeshi_ec_user_money_detail")
			public class UserMoneyDetail {

			public enum UserMoneyDetailTypeEnum {
			share("分享奖金", "", ""),
			invite("邀请奖金", "", ""),
			fanli("返利到账", "", ""),
			fanliWeiQuan("返利扣除", "",""),
			inviteWeiQuan("邀请奖金扣除", "", ""),
			shareWeiQuan("分享奖金扣除", "", ""),
			systemEqualize("系统补齐", "",""),
			scoreConvert("积分兑换", "", ""),
			hongbao("官方红包", "", ""),
			buyScore("购买积分", "",""),
			extract("提现", "", ""),
			extractVerify("提现验证", "", ""),
			extractReject("提现被拒", "", "");
			share("分享奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), invite("邀请奖金", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("奖金收入", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), fanli("返利到账", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png",
			""), fanliWeiQuan("返利扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", ""), inviteWeiQuan("邀请奖金扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), shareWeiQuan("分享奖金扣除", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png",
			""), weiQuan("售后订单扣款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", ""), systemEqualize("系统补齐", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_system.png", ""), scoreConvert("积分兑换", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png",
			""), hongbao("官方红包", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png", "http://www.baidu.com"), hongbaoDeduct("红包退款", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png",
			""), buyScore("购买积分", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png", ""), extract("提现", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png",
			""), extractVerify("提现验证", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png", ""), extractReject("提现被拒", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png", "");
			private final String desc;
			private final String picture;
			private final String helpUrl;
			@@ -50,90 +48,143 @@
			}
			}

			@Expose
			@Column(name = "umd_id")
			private Long id;
			@Column(name = "umd_uid")
			private UserInfo userInfo;
			@Expose
			@Column(name = "umd_money")
			private BigDecimal money;
			@Expose
			@Column(name = "umd_type")
			private UserMoneyDetailTypeEnum type;
			@Expose
			@Column(name = "umd_title")
			private String title;// 标题
			@Expose
			@Column(name = "umd_sub_title")
			private String subTitle;// 子标题
			@Expose
			@Column(name = "umd_desc_info")
			private String descInfo;// 简要信息
			@Column(name = "umd_source_identify_id")
			private Long sourceIdentifyId;// 来源方唯一标识ID（返利，邀请赚与分享赚不存在该属性）
			@Column(name = "umd_identify_code")
			private String identifyCode;// 唯一标识
			@Column(name = "umd_beizhu")
			private String beiZhu;// 备注信息
			@Expose
			@Column(name = "umd_createtime")
			private Date createTime;
			@Column(name = "umd_updatetime")
			private Date updateTime;

			private Integer state;//老版明细适用该字段

			public Integer getState() {
			return state;
			}

			public void setState(Integer state) {
			this.state = state;
			}

			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 BigDecimal getMoney() {
			return money;
			}

			public void setMoney(BigDecimal money) {
			this.money = money;
			}

			public UserMoneyDetailTypeEnum getType() {
			return type;
			}

			public void setType(UserMoneyDetailTypeEnum type) {
			this.type = type;
			}

			public String getTitle() {
			return title;
			}

			public void setTitle(String title) {
			this.title = title;
			}

			public String getSubTitle() {
			return subTitle;
			}

			public void setSubTitle(String subTitle) {
			this.subTitle = subTitle;
			}

			public String getDescInfo() {
			return descInfo;
			}

			public void setDescInfo(String descInfo) {
			this.descInfo = descInfo;
			}

			public Long getSourceIdentifyId() {
			return sourceIdentifyId;
			}

			public void setSourceIdentifyId(Long sourceIdentifyId) {
			this.sourceIdentifyId = sourceIdentifyId;
			}

			public String getIdentifyCode() {
			return identifyCode;
			}

			public void setIdentifyCode(String identifyCode) {
			this.identifyCode = identifyCode;
			}

			public String getBeiZhu() {
			return beiZhu;
			}

			public void setBeiZhu(String beiZhu) {
			this.beiZhu = beiZhu;
			}

			public Date getCreateTime() {
			return createTime;
			}

			public void setCreateTime(Date createTime) {
			this.createTime = createTime;
			}

			public Date getUpdateTime() {
			return updateTime;
			}

			public void setUpdateTime(Date updateTime) {
			this.updateTime = updateTime;
			}


			}