From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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..1083b94 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,9 +20,19 @@
@Table("yeshi_ec_msg_other")
public class MsgOtherDetail {
public enum MsgTypeOtherTypeEnum {
- couponMianDan("鍏嶅崟鍒�"), couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"), couponReward("濂栧姳鍒�"),
- taoLiJin("鎺ㄥ箍绾㈠寘"), give("璧犻��");
-
+ couponMianDan("鍏嶅崟鍒�"),
+ couponWelfareMianDan("绂忓埄鍏嶅崟鍒�"),
+ freeCouponBuy("鑷喘鍏嶅崟鍒�"),
+ freeCouponGive("璧犻�佸厤鍗曞埜"),
+ couponReward("濂栧姳鍒�"),
+ taoLiJin("鎺ㄥ箍绾㈠寘"),
+ taoLiJinExchange("鎺ㄥ箍绾㈠寘鍏戞崲閲戝竵"),
+ give("璧犻��"),
+ exchange("閲戝竵鍏戞崲"),
+ couponActivate("鍏嶅崟鍒告縺娲�"),
+ firstOrderReward("闃熷憳棣栧崟濂栧姳閭�璇蜂汉閲戝竵"),
+ systemGive("绯荤粺璧犻��");
+
private final String desc;
private MsgTypeOtherTypeEnum(String desc) {
@@ -57,11 +68,13 @@
// 娣樼ぜ閲戝弬鏁�
private MsgOtherTaoLiJinContentDTO taoLiJinContent;
-
+
// 璧犻�佷俊鎭�
private MsgOtherGiveContentDTO giveContent;
-
-
+
+ // 閲戝竵鍏戞崲淇℃伅
+ private MsgOtherExchangeContentDTO exchangeContent;
+
public MsgOtherCouponContentDTO getCoupnContent() {
return coupnContent;
}
@@ -157,4 +170,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