From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
index ea257f0..8f569a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
@@ -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,7 +22,7 @@
public final static int STATE_SX = 4;// 鏈粯娆�/宸查��娆�
public enum MsgTypeOrderTypeEnum {
- fanli("杩斿埄璁㈠崟"), share("鍒嗕韩璁㈠崟"), invite("閭�璇疯鍗�");
+ fanli("杩斿埄璁㈠崟"), share("鍒嗕韩璁㈠崟"), invite("閭�璇疯鍗�"), found("璁㈠崟鎵惧洖");
private final String desc;
private MsgTypeOrderTypeEnum(String desc) {
@@ -30,17 +34,31 @@
}
}
+ @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_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;
public Long getId() {
@@ -139,4 +157,12 @@
this.updateTime = updateTime;
}
+ public Date getHappendDate() {
+ return happendDate;
+ }
+
+ public void setHappendDate(Date happendDate) {
+ this.happendDate = happendDate;
+ }
+
}
--
Gitblit v1.8.0