fanli-server.git

parent: 6f72603c | 补丁 | 提交 | ignore whitespace

admin

2020-04-18 686927bd28608da6bcd11397974f42d910e03c62

推送消息修改

2个文件已修改

	fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java	279 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/resource/push_msg.properties	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java

@@ -36,76 +36,69 @@
    @Map("money_invite_recieved_msg")

    private String moneyInviteRecievedMsg;



    // 团队分红

    @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_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_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("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;



    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 +196,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 +212,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 +226,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() {


 fanli/src/main/resource/push_msg.properties

@@ -1,37 +1,62 @@
#推送消息



#返利订单被统计（失效订单无推送）

fanli_order_statisticed_title=返利订单

fanli_order_statisticed_msg=你的[订单类型]返利订单[订单号]，预估返利[金额]元，已被成功统计，请到我的-订单中查看。

fanli_order_statisticed_title=恭喜，有新订单了！

fanli_order_statisticed_msg=订单编号:[订单号]



#分享订单被统计（注意订单号隐藏）

share_order_statisticed_title=分享订单

share_order_statisticed_msg=你的[订单类型]分享订单[订单号]，预估分享奖金[金额]元，已被成功统计，请到我的-订单中查看。

share_order_statisticed_title=恭喜，有新订单了！

share_order_statisticed_msg=订单编号:[订单号]



#邀请订单被统计（注意订单号隐藏）

invite_order_statisticed_title=邀请订单

invite_order_statisticed_msg=你的[订单类型]邀请订单[订单号]，预估邀请奖金[金额]元，已被成功统计，请到我的-订单中查看。

invite_order_statisticed_title=恭喜，有新订单了！

invite_order_statisticed_msg=订单编号:[订单号]



#

#资金类消息

#



#返利到账

money_fanli_recieved_title=返利到账

money_fanli_recieved_msg=[订单类型]订单[订单号]，返利[金额]元，已存入到你的账户余额中，需再返请使用返利奖励券。

money_fanli_recieved_title=恭喜，有新收入了！

money_fanli_recieved_msg=自购返利存入了账户余额



#分享奖金到账

money_share_recieved_title=分享奖金到账

money_share_recieved_msg=你上月[订单类型]渠道有效分享奖金[金额]元，已存入到你的账户余额中，请注意查收。

money_share_recieved_title=恭喜，有新收入了！

money_share_recieved_msg=分享奖金存入了账户余额



#邀请奖金到账

money_invite_recieved_title=邀请奖金到账

money_invite_recieved_msg=你上月[订单类型]渠道有效邀请奖金[金额]元，已存入到你的账户余额中，请注意查收。

money_invite_recieved_title=恭喜，有新收入了！

money_invite_recieved_msg=团队收益存入了账户余额



#团队分红

money_team_dividents_recieved_title=恭喜，有新收入了！

money_team_dividents_recieved_msg=团队分红存入了账户余额



#导师津贴

money_tearcher_subsidy_recieved_title=恭喜，有新收入了！

money_tearcher_subsidy_recieved_msg=导师津贴存入了账户余额



#提现成功

money_extract_success_title=恭喜，提现成功了！

money_extract_success_msg=请到提现支付宝中账号中查收





#系统补齐

money_system_compensate_title=系统补齐

money_system_compensate_msg=因[原因]已经修复，系统补齐金额[金额]元，已存入到你的账户余额中，请注意查收。

money_system_compensate_title=恭喜，有新收入了！

money_system_compensate_msg=系统补齐存入了账户余额





#邀请队员成功

invite_team_success_title=恭喜，又新增了一个粉丝！

invite_team_success_msg=粉丝团队又双叒壮大了！





#系统消息

system_message_title=你有一条重要的消息未读

system_message_msg=请到消息-系统消息中查看





#----------------删除开始------------------



#系统扣除

money_system_sub_title=系统扣除

@@ -44,11 +69,6 @@
#维权扣除

money_weiquan_title=维权扣除

money_weiquan_msg=你的[订单类型]订单[订单号]，[部分]维权成功，对应[金额]元已扣除，请到账户明细中查看。 





#提现成功

money_extract_success_title=提现成功

money_extract_success_msg=恭喜你于[提现时间]提现[金额]元，提现成功，请到[支付宝账号]中查看。





#提现失败

@@ -86,10 +106,9 @@
function_get_fail_title=开通失败

function_get_fail_msg=你未能开通[增值功能]，如有疑问请联系人工客服。



#邀请队员成功

invite_team_success_title=邀请成功

invite_team_success_msg=你于[时间]成功邀请队员[队员昵称]，感谢使用和信任。



#客服唤起

msg_kefu_title=客服信息

msg_kefu_msg=人工客服发来了一条消息，请注意查阅（我的-人工客服），以便解决你的疑问。



#----------------删除结束------------------

			@@ -36,76 +36,69 @@
			@Map("money_invite_recieved_msg")
			private String moneyInviteRecievedMsg;

			// 团队分红
			@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_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_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("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;

			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 +196,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 +212,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 +226,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() {

			@@ -1,37 +1,62 @@
			#推送消息

			#返利订单被统计（失效订单无推送）
			fanli_order_statisticed_title=返利订单
			fanli_order_statisticed_msg=你的[订单类型]返利订单[订单号]，预估返利[金额]元，已被成功统计，请到我的-订单中查看。
			fanli_order_statisticed_title=恭喜，有新订单了！
			fanli_order_statisticed_msg=订单编号:[订单号]

			#分享订单被统计（注意订单号隐藏）
			share_order_statisticed_title=分享订单
			share_order_statisticed_msg=你的[订单类型]分享订单[订单号]，预估分享奖金[金额]元，已被成功统计，请到我的-订单中查看。
			share_order_statisticed_title=恭喜，有新订单了！
			share_order_statisticed_msg=订单编号:[订单号]

			#邀请订单被统计（注意订单号隐藏）
			invite_order_statisticed_title=邀请订单
			invite_order_statisticed_msg=你的[订单类型]邀请订单[订单号]，预估邀请奖金[金额]元，已被成功统计，请到我的-订单中查看。
			invite_order_statisticed_title=恭喜，有新订单了！
			invite_order_statisticed_msg=订单编号:[订单号]

			#
			#资金类消息
			#

			#返利到账
			money_fanli_recieved_title=返利到账
			money_fanli_recieved_msg=[订单类型]订单[订单号]，返利[金额]元，已存入到你的账户余额中，需再返请使用返利奖励券。
			money_fanli_recieved_title=恭喜，有新收入了！
			money_fanli_recieved_msg=自购返利存入了账户余额

			#分享奖金到账
			money_share_recieved_title=分享奖金到账
			money_share_recieved_msg=你上月[订单类型]渠道有效分享奖金[金额]元，已存入到你的账户余额中，请注意查收。
			money_share_recieved_title=恭喜，有新收入了！
			money_share_recieved_msg=分享奖金存入了账户余额

			#邀请奖金到账
			money_invite_recieved_title=邀请奖金到账
			money_invite_recieved_msg=你上月[订单类型]渠道有效邀请奖金[金额]元，已存入到你的账户余额中，请注意查收。
			money_invite_recieved_title=恭喜，有新收入了！
			money_invite_recieved_msg=团队收益存入了账户余额

			#团队分红
			money_team_dividents_recieved_title=恭喜，有新收入了！
			money_team_dividents_recieved_msg=团队分红存入了账户余额

			#导师津贴
			money_tearcher_subsidy_recieved_title=恭喜，有新收入了！
			money_tearcher_subsidy_recieved_msg=导师津贴存入了账户余额

			#提现成功
			money_extract_success_title=恭喜，提现成功了！
			money_extract_success_msg=请到提现支付宝中账号中查收


			#系统补齐
			money_system_compensate_title=系统补齐
			money_system_compensate_msg=因[原因]已经修复，系统补齐金额[金额]元，已存入到你的账户余额中，请注意查收。
			money_system_compensate_title=恭喜，有新收入了！
			money_system_compensate_msg=系统补齐存入了账户余额


			#邀请队员成功
			invite_team_success_title=恭喜，又新增了一个粉丝！
			invite_team_success_msg=粉丝团队又双叒壮大了！


			#系统消息
			system_message_title=你有一条重要的消息未读
			system_message_msg=请到消息-系统消息中查看


			#----------------删除开始------------------

			#系统扣除
			money_system_sub_title=系统扣除
			@@ -44,11 +69,6 @@
			#维权扣除
			money_weiquan_title=维权扣除
			money_weiquan_msg=你的[订单类型]订单[订单号]，[部分]维权成功，对应[金额]元已扣除，请到账户明细中查看。


			#提现成功
			money_extract_success_title=提现成功
			money_extract_success_msg=恭喜你于[提现时间]提现[金额]元，提现成功，请到[支付宝账号]中查看。


			#提现失败
			@@ -86,10 +106,9 @@
			function_get_fail_title=开通失败
			function_get_fail_msg=你未能开通[增值功能]，如有疑问请联系人工客服。

			#邀请队员成功
			invite_team_success_title=邀请成功
			invite_team_success_msg=你于[时间]成功邀请队员[队员昵称]，感谢使用和信任。

			#客服唤起
			msg_kefu_title=客服信息
			msg_kefu_msg=人工客服发来了一条消息，请注意查阅（我的-人工客服），以便解决你的疑问。

			#----------------删除结束------------------