From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java | 78 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 2 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..8729a80 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,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;
+ }
+
}
--
Gitblit v1.8.0