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

			/***
			@@ -11,6 +14,7 @@
			* @author Administrator
			*
			*/
			@Table("yeshi_ec_msg_order")
			public class MsgOrderDetail {
			public final static int STATE_FK = 1;// 已付款
			public final static int STATE_JS = 2;// 已收货
			@@ -18,30 +22,68 @@
			public final static int STATE_SX = 4;// 未付款/已退款

			public enum MsgTypeOrderTypeEnum {
			fanli("返利订单"), share("分享订单"), invite("邀请订单");
			fanli("返利订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			share("分享订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			invite("团队订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			found("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), // 老版
			foundSucceed("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			foundFail("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			orderStatistics("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			orderShare("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			orderInvite("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			businessRunning("订单失效", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
			elme("饿了么订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png");

			private final String desc;
			private final String icon;

			private MsgTypeOrderTypeEnum(String desc) {
			private MsgTypeOrderTypeEnum(String desc, String icon) {
			this.desc = desc;
			this.icon = icon;
			}

			public String getDesc() {
			return desc;
			}

			public String getIcon() {
			return icon;
			}
			}

			@Column(name = "mo_id")
			private Long id;
			@Column(name = "mo_uid")
			private UserInfo user;
			@Column(name = "mo_type")
			private MsgTypeOrderTypeEnum type;// 消息类型
			@Column(name = "mo_order_id")
			private String orderId;// 订单号
			@Column(name = "mo_order_type")
			private Integer orderType;// 订单类型
			@Column(name = "mo_state")
			private Integer state;// 状态
			@Column(name = "mo_goods_count")
			private Integer goodsCount;// 商品数量
			@Column(name = "mo_pay_money")
			private BigDecimal payMoney;// 付款金额
			@Column(name = "mo_hongbao_money")
			private BigDecimal hongBaoMoney;// 佣金
			@Column(name = "mo_happen_date")
			private Date happendDate;// 发生时间
			@Column(name = "mo_beizhu")
			private String beiZhu;
			@Column(name = "mo_read")
			private Boolean read;// 是否已读
			@Column(name = "mo_create_time")
			private Date createTime;
			@Column(name = "mo_update_time")
			private Date updateTime;
			// 唯一索引
			@Column(name = "mo_unique_key")
			private String uniquekey;

			private String extraInfo;// 新版消息内容

			public Long getId() {
			return id;
			@@ -139,4 +181,36 @@
			this.updateTime = updateTime;
			}

			public Date getHappendDate() {
			return happendDate;
			}

			public void setHappendDate(Date happendDate) {
			this.happendDate = happendDate;
			}

			public Integer getOrderType() {
			return orderType;
			}

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

			public String getExtraInfo() {
			return extraInfo;
			}

			public void setExtraInfo(String extraInfo) {
			this.extraInfo = extraInfo;
			}

			public String getUniquekey() {
			return uniquekey;
			}

			public void setUniquekey(String uniquekey) {
			this.uniquekey = uniquekey;
			}

			}