From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整
---
fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java | 297 ++++++++++++-----------------------------------------------
1 files changed, 61 insertions(+), 236 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java b/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java
index f344b15..a501e32 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java
@@ -36,76 +36,77 @@
@Map("money_invite_recieved_msg")
private String moneyInviteRecievedMsg;
- // 绯荤粺琛ラ綈
- @Map("money_system_compensate_title")
- private String moneySystemCompensateTitle;
- @Map("money_system_compensate_msg")
- private String moneySystemCompensateMsg;
- // 绯荤粺鎵ｉ櫎
- @Map("money_system_sub_title")
- private String moneySystemSubTitle;
- @Map("money_system_sub_msg")
- private String moneySystemSubMsg;
- // 绯荤粺濂栧姳
- @Map("money_system_reward_title")
- private String moneySystemRewardTitle;
- @Map("money_system_reward_msg")
- private String moneySystemRewardMsg;
- // 缁存潈鎵ｉ櫎
- @Map("money_weiquan_title")
- private String moneyWeiquanTitle;
- @Map("money_weiquan_msg")
- private String moneyWeiquanMsg;
+ // 鍥㈤槦鍒嗙孩
+ @Map("money_team_dividents_recieved_title")
+ private String moneyTeamDividentsRecievedTitle;
+
+ @Map("money_team_dividents_recieved_msg")
+ private String moneyTeamDividentsRecievedMsg;
+
+ // 瀵煎笀娲ヨ创
+ @Map("money_tearcher_subsidy_recieved_title")
+ private String moneyTearcherSubsidyRecievedTitle;
+
+ @Map("money_tearcher_subsidy_recieved_msg")
+ private String moneyTearcherSubsidyRecievedMsg;
+
+
// 鎻愮幇鎴愬姛
@Map("money_extract_success_title")
private String moneyExtractSuccessTitle;
@Map("money_extract_success_msg")
private String moneyExtractSuccessMsg;
- // 鎻愮幇澶辫触
- @Map("money_extract_fail_title")
- private String moneyExtractFailTitle;
- @Map("money_extract_fail_msg")
- private String moneyExtractFailMsg;
- // 鐜伴噾绾㈠寘
- @Map("hongbao_recieved_title")
- private String hongbaoRecievedTitle;
- @Map("hongbao_recieved_msg")
- private String hongbaoRecievedMsg;
- // 鏀粯瀹濊处鍙烽獙璇�
- @Map("alipay_account_valid_title")
- private String alipayAccountValidTitle;
- @Map("alipay_account_valid_msg")
- private String alipayAccountValidMsg;
- // 绉垎鍏戞崲鎴愬姛
- @Map("score_exchange_success_title")
- private String scoreExchangeSuccessTitle;
- @Map("score_exchange_success_msg")
- private String scoreExchangeSuccessMsg;
- // 绉垎鍏戞崲澶辫触
- @Map("score_exchange_fail_title")
- private String scoreExchangeFailTitle;
- @Map("score_exchange_fail_msg")
- private String scoreExchangeFailMsg;
- // 鍔熻兘寮�閫氭垚鍔�
- @Map("function_get_success_title")
- private String functionGetSuccessTitle;
- @Map("function_get_success_msg")
- private String functionGetSuccessMsg;
- // 鍔熻兘寮�閫氬け璐�
- @Map("function_get_fail_title")
- private String functionGetFailTitle;
- @Map("function_get_fail_msg")
- private String functionGetFailMsg;
+
+ // 绯荤粺琛ラ綈
+ @Map("money_system_compensate_title")
+ private String moneySystemCompensateTitle;
+ @Map("money_system_compensate_msg")
+ private String moneySystemCompensateMsg;
+
+
// 閭�璇烽槦鍛樻垚鍔�
@Map("invite_team_success_title")
private String inviteTeamSuccessTitle;
@Map("invite_team_success_msg")
private String inviteTeamSuccessMsg;
- // 瀹㈡湇鍞よ捣
- @Map("msg_kefu_title")
- private String msgKefuTitle;
- @Map("msg_kefu_msg")
- private String msgKefuMsg;
+
+ //绯荤粺娑堟伅
+ @Map("system_message_title")
+ private String systemMessageTitle;
+ @Map("system_message_msg")
+ private String systemMessageMsg;
+
+ public String getMoneyTeamDividentsRecievedTitle() {
+ return moneyTeamDividentsRecievedTitle;
+ }
+
+ public void setMoneyTeamDividentsRecievedTitle(String moneyTeamDividentsRecievedTitle) {
+ this.moneyTeamDividentsRecievedTitle = moneyTeamDividentsRecievedTitle;
+ }
+
+ public String getMoneyTeamDividentsRecievedMsg() {
+ return moneyTeamDividentsRecievedMsg;
+ }
+
+ public void setMoneyTeamDividentsRecievedMsg(String moneyTeamDividentsRecievedMsg) {
+ this.moneyTeamDividentsRecievedMsg = moneyTeamDividentsRecievedMsg;
+ }
+
+ public String getMoneyTearcherSubsidyRecievedTitle() {
+ return moneyTearcherSubsidyRecievedTitle;
+ }
+
+ public void setMoneyTearcherSubsidyRecievedTitle(String moneyTearcherSubsidyRecievedTitle) {
+ this.moneyTearcherSubsidyRecievedTitle = moneyTearcherSubsidyRecievedTitle;
+ }
+
+ public String getMoneyTearcherSubsidyRecievedMsg() {
+ return moneyTearcherSubsidyRecievedMsg;
+ }
+
+ public void setMoneyTearcherSubsidyRecievedMsg(String moneyTearcherSubsidyRecievedMsg) {
+ this.moneyTearcherSubsidyRecievedMsg = moneyTearcherSubsidyRecievedMsg;
+ }
public String getFanliOrderStatisticedTitle() {
return fanliOrderStatisticedTitle;
@@ -203,54 +204,6 @@
this.moneySystemCompensateMsg = moneySystemCompensateMsg;
}
- public String getMoneySystemSubTitle() {
- return moneySystemSubTitle;
- }
-
- public void setMoneySystemSubTitle(String moneySystemSubTitle) {
- this.moneySystemSubTitle = moneySystemSubTitle;
- }
-
- public String getMoneySystemSubMsg() {
- return moneySystemSubMsg;
- }
-
- public void setMoneySystemSubMsg(String moneySystemSubMsg) {
- this.moneySystemSubMsg = moneySystemSubMsg;
- }
-
- public String getMoneySystemRewardTitle() {
- return moneySystemRewardTitle;
- }
-
- public void setMoneySystemRewardTitle(String moneySystemRewardTitle) {
- this.moneySystemRewardTitle = moneySystemRewardTitle;
- }
-
- public String getMoneySystemRewardMsg() {
- return moneySystemRewardMsg;
- }
-
- public void setMoneySystemRewardMsg(String moneySystemRewardMsg) {
- this.moneySystemRewardMsg = moneySystemRewardMsg;
- }
-
- public String getMoneyWeiquanTitle() {
- return moneyWeiquanTitle;
- }
-
- public void setMoneyWeiquanTitle(String moneyWeiquanTitle) {
- this.moneyWeiquanTitle = moneyWeiquanTitle;
- }
-
- public String getMoneyWeiquanMsg() {
- return moneyWeiquanMsg;
- }
-
- public void setMoneyWeiquanMsg(String moneyWeiquanMsg) {
- this.moneyWeiquanMsg = moneyWeiquanMsg;
- }
-
public String getMoneyExtractSuccessTitle() {
return moneyExtractSuccessTitle;
}
@@ -267,118 +220,6 @@
this.moneyExtractSuccessMsg = moneyExtractSuccessMsg;
}
- public String getMoneyExtractFailTitle() {
- return moneyExtractFailTitle;
- }
-
- public void setMoneyExtractFailTitle(String moneyExtractFailTitle) {
- this.moneyExtractFailTitle = moneyExtractFailTitle;
- }
-
- public String getMoneyExtractFailMsg() {
- return moneyExtractFailMsg;
- }
-
- public void setMoneyExtractFailMsg(String moneyExtractFailMsg) {
- this.moneyExtractFailMsg = moneyExtractFailMsg;
- }
-
- public String getHongbaoRecievedTitle() {
- return hongbaoRecievedTitle;
- }
-
- public void setHongbaoRecievedTitle(String hongbaoRecievedTitle) {
- this.hongbaoRecievedTitle = hongbaoRecievedTitle;
- }
-
- public String getHongbaoRecievedMsg() {
- return hongbaoRecievedMsg;
- }
-
- public void setHongbaoRecievedMsg(String hongbaoRecievedMsg) {
- this.hongbaoRecievedMsg = hongbaoRecievedMsg;
- }
-
- public String getAlipayAccountValidTitle() {
- return alipayAccountValidTitle;
- }
-
- public void setAlipayAccountValidTitle(String alipayAccountValidTitle) {
- this.alipayAccountValidTitle = alipayAccountValidTitle;
- }
-
- public String getAlipayAccountValidMsg() {
- return alipayAccountValidMsg;
- }
-
- public void setAlipayAccountValidMsg(String alipayAccountValidMsg) {
- this.alipayAccountValidMsg = alipayAccountValidMsg;
- }
-
- public String getScoreExchangeSuccessTitle() {
- return scoreExchangeSuccessTitle;
- }
-
- public void setScoreExchangeSuccessTitle(String scoreExchangeSuccessTitle) {
- this.scoreExchangeSuccessTitle = scoreExchangeSuccessTitle;
- }
-
- public String getScoreExchangeSuccessMsg() {
- return scoreExchangeSuccessMsg;
- }
-
- public void setScoreExchangeSuccessMsg(String scoreExchangeSuccessMsg) {
- this.scoreExchangeSuccessMsg = scoreExchangeSuccessMsg;
- }
-
- public String getScoreExchangeFailTitle() {
- return scoreExchangeFailTitle;
- }
-
- public void setScoreExchangeFailTitle(String scoreExchangeFailTitle) {
- this.scoreExchangeFailTitle = scoreExchangeFailTitle;
- }
-
- public String getScoreExchangeFailMsg() {
- return scoreExchangeFailMsg;
- }
-
- public void setScoreExchangeFailMsg(String scoreExchangeFailMsg) {
- this.scoreExchangeFailMsg = scoreExchangeFailMsg;
- }
-
- public String getFunctionGetSuccessTitle() {
- return functionGetSuccessTitle;
- }
-
- public void setFunctionGetSuccessTitle(String functionGetSuccessTitle) {
- this.functionGetSuccessTitle = functionGetSuccessTitle;
- }
-
- public String getFunctionGetSuccessMsg() {
- return functionGetSuccessMsg;
- }
-
- public void setFunctionGetSuccessMsg(String functionGetSuccessMsg) {
- this.functionGetSuccessMsg = functionGetSuccessMsg;
- }
-
- public String getFunctionGetFailTitle() {
- return functionGetFailTitle;
- }
-
- public void setFunctionGetFailTitle(String functionGetFailTitle) {
- this.functionGetFailTitle = functionGetFailTitle;
- }
-
- public String getFunctionGetFailMsg() {
- return functionGetFailMsg;
- }
-
- public void setFunctionGetFailMsg(String functionGetFailMsg) {
- this.functionGetFailMsg = functionGetFailMsg;
- }
-
public String getInviteTeamSuccessTitle() {
return inviteTeamSuccessTitle;
}
@@ -393,22 +234,6 @@
public void setInviteTeamSuccessMsg(String inviteTeamSuccessMsg) {
this.inviteTeamSuccessMsg = inviteTeamSuccessMsg;
- }
-
- public String getMsgKefuTitle() {
- return msgKefuTitle;
- }
-
- public void setMsgKefuTitle(String msgKefuTitle) {
- this.msgKefuTitle = msgKefuTitle;
- }
-
- public String getMsgKefuMsg() {
- return msgKefuMsg;
- }
-
- public void setMsgKefuMsg(String msgKefuMsg) {
- this.msgKefuMsg = msgKefuMsg;
}
public String getMoneyInviteRecievedTitle() {
--
Gitblit v1.8.0