From 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 14:45:20 +0800
Subject: [PATCH] vip 消息

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java |   48 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 40 insertions(+), 8 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 01dcf13..83a4c1f 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,7 @@
 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;
@@ -19,17 +20,38 @@
 @Table("yeshi_ec_msg_other")
 public class MsgOtherDetail {
 	public enum MsgTypeOtherTypeEnum {
-		couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�"),
-		taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��");
-		
-		private final String desc;
+		couponMianDan("鍏嶅崟鍒�",""),
+		couponWelfareMianDan("绂忓埄鍏嶅崟鍒�",""),
+		freeCouponBuy("鑷喘鍏嶅崟鍒�",""),
+		freeCouponGive("璧犻�佸厤鍗曞埜",""),
+		couponReward("濂栧姳鍒�",""),
+		taoLiJin("鎺ㄥ箍绾㈠寘",""),
+		taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵",""),
+		give("璧犻��",""),
+		exchange("閲戝竵鍏戞崲",""),
+		couponActivate("鍏嶅崟鍒告縺娲�",""),
+		firstOrderReward("绮変笣棣栧崟濂栧姳閭�璇蜂汉閲戝竵",""),
+		systemGive("绯荤粺璧犻��",""),
+		passVIPApply("瓒呯骇浼氬憳",""),
+		rejectVIPApply("瓒呯骇浼氬憳",""),
+		teamVIPCallBoss ("娓╅Θ鎻愰啋",""),
+		teamSplitCallBoss ("閭�璇疯劚绂�",""),
+		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;
 		}
 	}
 
@@ -57,11 +79,13 @@
 
 	// 娣樼ぜ閲戝弬鏁�
 	private MsgOtherTaoLiJinContentDTO taoLiJinContent;
-	
+
 	// 璧犻�佷俊鎭�
 	private MsgOtherGiveContentDTO giveContent;
-	
-	
+
+	// 閲戝竵鍏戞崲淇℃伅
+	private MsgOtherExchangeContentDTO exchangeContent;
+
 	public MsgOtherCouponContentDTO getCoupnContent() {
 		return coupnContent;
 	}
@@ -157,4 +181,12 @@
 	public void setGiveContent(MsgOtherGiveContentDTO giveContent) {
 		this.giveContent = giveContent;
 	}
+
+	public MsgOtherExchangeContentDTO getExchangeContent() {
+		return exchangeContent;
+	}
+
+	public void setExchangeContent(MsgOtherExchangeContentDTO exchangeContent) {
+		this.exchangeContent = exchangeContent;
+	}
 }

--
Gitblit v1.8.0