From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java
index 3d34723..9c350e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java
@@ -6,6 +6,9 @@
import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/**
@@ -17,15 +20,39 @@
@Table("yeshi_ec_msg_other")
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
- couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�");
- private final String desc;
+ couponMianDan("鍏嶅崟鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+ couponWelfareMianDan("绂忓埄鍏嶅崟鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+ freeCouponBuy("鑷喘鍏嶅崟鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+ freeCouponGive("璧犻�佸厤鍗曞埜","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+ couponReward("濂栧姳鍒�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+ couponActivate("鍏嶅崟鍒告縺娲�","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),
+ taoLiJin("鎺ㄥ箍绾㈠寘","http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png"),
+ taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),
+ give("璧犻��","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+ exchange("閲戝竵鍏戞崲","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+ goldCoin("閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+ firstOrderReward("绮変笣棣栧崟濂栧姳閭�璇蜂汉閲戝竵","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),
+ systemGive("绯荤粺璧犻��","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),
+ passVIPApply("瓒呯骇浼氬憳","http://img.flqapp.com/resource/msg/icon_msg_vip.png"),
+ rejectVIPApply("瓒呯骇浼氬憳","http://img.flqapp.com/resource/msg/icon_msg_vip.png"),
+ teamVIPCallBoss ("娓╅Θ鎻愰啋","http://img.flqapp.com/resource/msg/icon_msg_notify.png"),
+ teamSplitCallBoss ("閭�璇疯劚绂�","http://img.flqapp.com/resource/msg/icon_msg_invite_break.png"),
+ vipUpgradeReward("绯荤粺璧犻��","http://img.flqapp.com/resource/msg/icon_msg_vip.png");
- private MsgTypeOtherTypeEnum(String desc) {
+ private final String desc;
+ private final String icon;
+
+ private MsgTypeOtherTypeEnum(String desc, String icon) {
this.desc = desc;
+ this.icon = icon;
}
public String getDesc() {
return desc;
+ }
+
+ public String getIcon() {
+ return icon;
}
}
@@ -41,13 +68,28 @@
private String beiZhu;// 澶囨敞
@Column(name = "mo_read")
private Boolean read;
+ @Column(name = "mo_source_id") // 婧愪富閿甀D
+ private Long sourceId;
@Column(name = "mo_create_time")
private Date createTime;
@Column(name = "mo_update_time")
private Date updateTime;
+
+ private String extraInfo;
+
+
// 鍒稿唴瀹�
private MsgOtherCouponContentDTO coupnContent;
+
+ // 娣樼ぜ閲戝弬鏁�
+ private MsgOtherTaoLiJinContentDTO taoLiJinContent;
+
+ // 璧犻�佷俊鎭�
+ private MsgOtherGiveContentDTO giveContent;
+
+ // 閲戝竵鍏戞崲淇℃伅
+ private MsgOtherExchangeContentDTO exchangeContent;
public MsgOtherCouponContentDTO getCoupnContent() {
return coupnContent;
@@ -120,4 +162,44 @@
public void setBeiZhu(String beiZhu) {
this.beiZhu = beiZhu;
}
+
+ public Long getSourceId() {
+ return sourceId;
+ }
+
+ public void setSourceId(Long sourceId) {
+ this.sourceId = sourceId;
+ }
+
+ public MsgOtherTaoLiJinContentDTO getTaoLiJinContent() {
+ return taoLiJinContent;
+ }
+
+ public void setTaoLiJinContent(MsgOtherTaoLiJinContentDTO taoLiJinContent) {
+ this.taoLiJinContent = taoLiJinContent;
+ }
+
+ public MsgOtherGiveContentDTO getGiveContent() {
+ return giveContent;
+ }
+
+ public void setGiveContent(MsgOtherGiveContentDTO giveContent) {
+ this.giveContent = giveContent;
+ }
+
+ public MsgOtherExchangeContentDTO getExchangeContent() {
+ return exchangeContent;
+ }
+
+ public void setExchangeContent(MsgOtherExchangeContentDTO exchangeContent) {
+ this.exchangeContent = exchangeContent;
+ }
+
+ public String getExtraInfo() {
+ return extraInfo;
+ }
+
+ public void setExtraInfo(String extraInfo) {
+ this.extraInfo = extraInfo;
+ }
}
--
Gitblit v1.8.0