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/MsgMoneyDetail.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 3418d82..d71d748 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -19,28 +19,48 @@
@Table("yeshi_ec_msg_money")
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
+ fanli("璧勯噾鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),
+ share("璧勯噾鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_share_money.png"),
+ invite("璧勯噾鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_invite_money.png"),
+ extract("鎻愮幇", "http://img.flqapp.com/resource/msg/icon_msg_extract.png"),
+ fanliWeiQuan("璧勯噾閫�鍥�","http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),
+ shareWeiQuan("璧勯噾閫�鍥�", "http://img.flqapp.com/resource/msg/icon_msg_share_money.png"),
+ extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_system.png"),
+ extractValid("鎻愮幇璐﹀彿楠岃瘉", "http://img.flqapp.com/resource/msg/icon_msg_extract.png"),
+ inviteWeiQuan("鍥㈤槦濂栭噾鎵ｉ櫎", "http://img.flqapp.com/resource/msg/icon_msg_invite_money.png"),
+ orderReward("杩斿埄濂栧姳","http://img.flqapp.com/resource/msg/icon_msg_order_reward.png"),
+ systemEqualize("绯荤粺琛ラ綈","http://img.flqapp.com/resource/money_detail/icon_system.png"),
+ fanliElme("杩斿埄鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),
+ subSidy("棰濆琛ヨ创", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png"),
+ redPackGiveOff("璧犻�佺孩鍖呭畬鎴�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
+ redPackReceiveOff("璧犻�佺孩鍖呴鍙�","http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
+ redPackGiveBack("绾㈠寘閫�鍥�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
+ redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+ redPackExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+ redPackOneStageReward("绗竴闃舵-绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackTwoStageReward("绗簩闃舵-閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackThreeStageReward("绗笁闃舵-杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackUseSuccess("绾㈠寘浣跨敤鎴愬姛","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackUseFail("绾㈠寘浣跨敤澶辫触","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackForbid("绾㈠寘灏佺","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackForbidRemove("绾㈠寘瑙ｅ皝","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ redPackDeduct("绾㈠寘鎵ｉ櫎","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ orderTeamReward("鍥㈤槦濂栧姳","http://img.flqapp.com/resource/msg/icon_msg_team_reward.png");
- share("鍒嗕韩濂栭噾"),
- invite("閭�璇峰閲�"),
- fanli("杩斿埄鍒拌处"),
- extract("鎻愮幇"),
- extractAutoWX("鑷姩鎻愮幇"),
- extractValid("鎻愮幇璐﹀彿楠岃瘉"),
- shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎"),
- inviteWeiQuan("閭�璇峰閲戞墸闄�"),
- fanliWeiQuan("杩斿埄鎵ｉ櫎"),
- orderReward("杩斿埄濂栧姳"),
- systemEqualize("绯荤粺琛ラ綈"),
- fanliElme("杩斿埄鍒拌处"),
- subSidy("棰濆琛ヨ创");
private final String desc;
+ private final String icon;
- private MsgTypeMoneyTypeEnum(String desc) {
+ private MsgTypeMoneyTypeEnum(String desc, String icon) {
this.desc = desc;
+ this.icon = icon;
}
public String getDesc() {
return desc;
+ }
+
+ public String getIcon() {
+ return icon;
}
}
@@ -77,6 +97,11 @@
private Date updateTime;
@Column(name = "mm_read")
private Boolean read;
+ @Column(name = "mm_content") // 娑堟伅鍐呭
+ private String content;
+
+ private String extraInfo;// 鏂扮増娑堟伅鍐呭
+
public Long getId() {
return id;
@@ -213,4 +238,20 @@
public void setDesc(String desc) {
this.desc = desc;
}
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getExtraInfo() {
+ return extraInfo;
+ }
+
+ public void setExtraInfo(String extraInfo) {
+ this.extraInfo = extraInfo;
+ }
}
--
Gitblit v1.8.0