fanli-server.git

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

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

			import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
			import com.yeshi.fanli.entity.bus.user.Extract;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			@@ -13,12 +16,39 @@
			* @author Administrator
			*
			*/
			@Table("yeshi_ec_msg_money")
			public class MsgMoneyDetail {
			public enum MsgTypeMoneyEnumType {
			share("分享奖金"), invite("邀请奖金"), fanli("返利到账"), extract("提现"), extractValid("提现账号验证");
			public enum MsgTypeMoneyTypeEnum {
			share("分享奖金"),
			invite("邀请奖金"),
			fanli("返利到账"),
			extract("提现"),
			extractAutoWX("自动提现"),
			extractValid("提现账号验证"),
			shareWeiQuan("分享奖金扣除"),
			inviteWeiQuan("邀请奖金扣除"),
			fanliWeiQuan("返利扣除"),
			orderReward("返利奖励"),
			systemEqualize("系统补齐"),
			fanliElme("返利到账"),
			subSidy("额外补贴"),
			redPackGiveOff("赠送红包完成"),
			redPackReceiveOff("赠送红包领取"),
			redPackGiveBack("红包退回"),
			redPackExchangePass("红包提现成功"),
			redPackExchangeReject("红包提现失败"),
			redPackOneStageReward("第一阶段-立得现金-成功邀请好友"),
			redPackTwoStageReward("第二阶段-递增奖励-好友完成订单"),
			redPackThreeStageReward("第三阶段-连续奖励-好友完成订单"),
			redPackUseSuccess("红包使用成功"),
			redPackUseFail("红包使用失败"),
			redPackForbid("红包封禁"),
			redPackForbidRemove("红包解封"),
			redPackDeduct("红包扣除");

			private final String desc;

			private MsgTypeMoneyEnumType(String desc) {
			private MsgTypeMoneyTypeEnum(String desc) {
			this.desc = desc;
			}

			@@ -27,20 +57,41 @@
			}
			}

			@Column(name = "mm_id")
			private Long id;
			@Column(name = "mm_uid")
			private UserInfo user;
			private MsgTypeMoneyEnumType msgType;// 消息类型
			@Column(name = "mm_type")
			private MsgTypeMoneyTypeEnum msgType;// 消息类型
			@Column(name = "mm_order_count")
			private Integer orderCount;// 订单数(奖金适用)
			@Column(name = "mm_goods_count")
			private Integer goodsCount;// 商品数
			@Column(name = "mm_order_id")
			private String orderId;// 订单号（返利适用）
			@Column(name = "mm_order_type")
			private Integer orderType;
			@Column(name = "mm_source_id")
			private Extract extract;// 提现详情
			private AlipayAccountValidNormalHistory alipayAccountValid;// 提现账号验证详情
			@Column(name = "mm_money")
			private BigDecimal money;// 到账资金
			@Column(name = "mm_balance")
			private BigDecimal balance;// 账户余额
			@Column(name = "mm_state_desc")
			private String stateDesc;// 状态说明
			@Column(name = "mm_desc")
			private String desc;// 说明
			@Column(name = "mm_beizhu")
			private String beiZhu;// 备注
			@Column(name = "mm_create_time")
			private Date createTime;
			@Column(name = "mm_update_time")
			private Date updateTime;
			@Column(name = "mm_read")
			private Boolean read;
			@Column(name = "mm_content") // 消息内容
			private String content;

			public Long getId() {
			return id;
			@@ -58,11 +109,19 @@
			this.user = user;
			}

			public MsgTypeMoneyEnumType getMsgType() {
			public String getStateDesc() {
			return stateDesc;
			}

			public void setStateDesc(String stateDesc) {
			this.stateDesc = stateDesc;
			}

			public MsgTypeMoneyTypeEnum getMsgType() {
			return msgType;
			}

			public void setMsgType(MsgTypeMoneyEnumType msgType) {
			public void setMsgType(MsgTypeMoneyTypeEnum msgType) {
			this.msgType = msgType;
			}

			@@ -154,4 +213,27 @@
			this.alipayAccountValid = alipayAccountValid;
			}

			public Integer getOrderType() {
			return orderType;
			}

			public void setOrderType(Integer orderType) {
			this.orderType = orderType;
			}

			public String getDesc() {
			return desc;
			}

			public void setDesc(String desc) {
			this.desc = desc;
			}

			public String getContent() {
			return content;
			}

			public void setContent(String content) {
			this.content = content;
			}
			}