From be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java | 191 ++++-------------------------------------------
1 files changed, 19 insertions(+), 172 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java b/fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java
index db5ce52..44715ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java
@@ -38,8 +38,7 @@
String title = Constant.znxConfig.getShareOrderStatisticedTitle();
String content = Constant.znxConfig.getShareOrderStatisticedMsg();
content = content.replace("[璁㈠崟绫诲瀷]", Constant.getSourceName(sourceType))
- .replace("[璁㈠崟鍙穄", orderId.substring(0, orderId.length() - 6) + "******")
- .replace("[閲戦]", money.toString());
+ .replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString());
return new PushContentDTO(title, content);
}
@@ -55,8 +54,7 @@
String title = Constant.znxConfig.getInviteOrderStatisticedTitle();
String content = Constant.znxConfig.getInviteOrderStatisticedMsg();
content = content.replace("[璁㈠崟绫诲瀷]", Constant.getSourceName(sourceType))
- .replace("[璁㈠崟鍙穄", orderId.substring(0, orderId.length() - 6) + "******")
- .replace("[閲戦]", money.toString());
+ .replace("[璁㈠崟鍙穄", UserUtil.filterOrderId(orderId)).replace("[閲戦]", money.toString());
return new PushContentDTO(title, content);
}
@@ -108,6 +106,23 @@
}
/**
+ * 鍥㈤槦鍒嗙孩
+ * @Title: createMoneyTeamDividents
+ * @Description:
+ * @param sourceType
+ * @param money
+ * @return
+ * PushContentDTO 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static PushContentDTO createMoneyTeamDividents(BigDecimal money) {
+ String title = Constant.znxConfig.getMoneyTeamDividentsRecievedTitle();
+ String content = Constant.znxConfig.getMoneyTeamDividentsRecievedMsg();
+ content = content.replace("[閲戦]", money.toString());
+ return new PushContentDTO(title, content);
+ }
+
+ /**
* 绯荤粺琛ラ綈
*
* @param reason
@@ -122,70 +137,6 @@
}
/**
- * 绯荤粺鎵ｉ櫎
- * @param reason
- * @param money
- * @return
- */
- public static PushContentDTO createMoneySystemSub(String reason, BigDecimal money) {
- String title = Constant.znxConfig.getMoneySystemSubTitle();
- String content = Constant.znxConfig.getMoneySystemSubMsg();
- content = content.replace("[鍘熷洜]", reason).replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 绯荤粺濂栧姳
- * @param reason
- * @param money
- * @return
- */
- public static PushContentDTO createMoneySystemReward(String reason, BigDecimal money) {
- String title = Constant.znxConfig.getMoneySystemRewardTitle();
- String content = Constant.znxConfig.getMoneySystemRewardMsg();
- content = content.replace("[鍘熷洜]", reason).replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 杩斿埄缁存潈鎵ｉ櫎
- *
- * @param sourceType
- * @param orderId
- * @param part-鏄惁涓洪儴鍒嗙淮鏉�
- * @param money
- * @return
- */
- public static PushContentDTO createMoneyOrderFanLiWeiquan(int sourceType, String orderId, boolean part,
- BigDecimal money) {
- String title = Constant.znxConfig.getMoneyWeiquanTitle();
- String content = Constant.znxConfig.getMoneyWeiquanMsg();
- content = content.replace("[璁㈠崟绫诲瀷]", Constant.getSourceName(sourceType)).replace("[璁㈠崟鍙穄", orderId)
- .replace("[閮ㄥ垎]", part ? "閮ㄥ垎" : "").replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 鍒嗕韩鎴栭個璇风淮鏉冩墸闄�
- *
- * @param sourceType
- * @param orderId
- * @param part
- * @param money
- * @return
- */
-
- public static PushContentDTO createMoneyOrderShareOrInviteWeiquan(int sourceType, String orderId, boolean part,
- BigDecimal money) {
- String title = Constant.znxConfig.getMoneyWeiquanTitle();
- String content = Constant.znxConfig.getMoneyWeiquanMsg();
- content = content.replace("[璁㈠崟绫诲瀷]", Constant.getSourceName(sourceType))
- .replace("[璁㈠崟鍙穄", orderId.substring(0, orderId.length() - 6) + "******")
- .replace("[閮ㄥ垎]", part ? "閮ㄥ垎" : "").replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
* 鎻愮幇鎴愬姛
* @param applyTime
* @param money
@@ -196,101 +147,7 @@
String title = Constant.znxConfig.getMoneyExtractSuccessTitle();
String content = Constant.znxConfig.getMoneyExtractSuccessMsg();
content = content.replace("[鎻愮幇鏃堕棿]", TimeUtil.getGernalTime(applyTime.getTime(), "yyyy.MM.dd HH:mm"))
- .replace("[鏀粯瀹濊处鍙穄",UserUtil.filterAlipayAccount(alipayAccount)).replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 鎻愮幇澶辫触
- * @param applyTime
- * @param money
- * @param alipayAccount
- * @return
- */
- public static PushContentDTO createmoneyExtractFail(Date applyTime, BigDecimal money, String alipayAccount) {
- String title = Constant.znxConfig.getMoneyExtractFailTitle();
- String content = Constant.znxConfig.getMoneyExtractFailMsg();
- content = content.replace("[鎻愮幇鏃堕棿]", TimeUtil.getGernalTime(applyTime.getTime(), "yyyy.MM.dd HH:mm"))
.replace("[鏀粯瀹濊处鍙穄", UserUtil.filterAlipayAccount(alipayAccount)).replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 鐜伴噾绾㈠寘
- * @param reason
- * @param money
- * @return
- */
- public static PushContentDTO createHongbaoRecieved(String reason, BigDecimal money) {
- String title = Constant.znxConfig.getHongbaoRecievedTitle();
- String content = Constant.znxConfig.getHongbaoRecievedMsg();
- content = content.replace("[鍘熷洜]", reason).replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 鏀粯瀹濊处鍙烽獙璇�
- * @param alipayAccount
- * @param money
- * @return
- */
- public static PushContentDTO createAlipayAccountValid(String alipayAccount, BigDecimal money) {
- String title = Constant.znxConfig.getAlipayAccountValidTitle();
- String content = Constant.znxConfig.getAlipayAccountValidMsg();
- content = content.replace("[鏀粯瀹濊处鍙穄", UserUtil.filterAlipayAccount(alipayAccount)).replace("[閲戦]", money.toString());
- return new PushContentDTO(title, content);
- }
-
- /**
- * 绉垎鍏戞崲鎴愬姛
- * @param reason
- * @param time
- * @return
- */
- public static PushContentDTO createScoreExchangeSuccess(Date time, int score) {
- String title = Constant.znxConfig.getScoreExchangeSuccessTitle();
- String content = Constant.znxConfig.getScoreExchangeSuccessMsg();
- content = content.replace("[鏃堕棿]", TimeUtil.getGernalTime(time.getTime(), "yyyy.MM.dd HH:mm")).replace("[绉垎鏁伴]",
- score + "");
- return new PushContentDTO(title, content);
- }
-
- /**
- * 绉垎鍏戞崲澶辫触
- * @param reason
- * @param time
- * @return
- */
- public static PushContentDTO createScoreExchangeFail(String reason, Date time) {
- String title = Constant.znxConfig.getScoreExchangeFailTitle();
- String content = Constant.znxConfig.getScoreExchangeFailMsg();
- content = content.replace("[鏃堕棿]", TimeUtil.getGernalTime(time.getTime(), "yyyy.MM.dd HH:mm")).replace("[鍘熷洜]",
- reason);
- return new PushContentDTO(title, content);
- }
-
-
- /**
- * 鍔熻兘寮�閫氭垚鍔�
- * @param functionName
- * @return
- */
- public static PushContentDTO createFunctionGetSuccess(String functionName) {
- String title = Constant.znxConfig.getFunctionGetSuccessTitle();
- String content = Constant.znxConfig.getFunctionGetSuccessMsg();
- content = content.replace("[澧炲�煎姛鑳絔", functionName);
- return new PushContentDTO(title, content);
- }
-
- /**
- * 鍔熻兘寮�閫氬け璐�
- * @param functionName
- * @return
- */
- public static PushContentDTO createFunctionGetFail(String functionName) {
- String title = Constant.znxConfig.getFunctionGetFailTitle();
- String content = Constant.znxConfig.getFunctionGetFailMsg();
- content = content.replace("[澧炲�煎姛鑳絔", functionName);
return new PushContentDTO(title, content);
}
@@ -305,16 +162,6 @@
String content = Constant.znxConfig.getInviteTeamSuccessMsg();
content = content.replace("[鏃堕棿]", TimeUtil.getGernalTime(time.getTime(), "yyyy.MM.dd HH:mm")).replace("[闃熷憳鏄电О]",
nickName);
- return new PushContentDTO(title, content);
- }
-
- /**
- * 瀹㈡湇鍞よ捣
- * @return
- */
- public static PushContentDTO createMsgKefu() {
- String title = Constant.znxConfig.getMsgKefuTitle();
- String content = Constant.znxConfig.getMsgKefuMsg();
return new PushContentDTO(title, content);
}
--
Gitblit v1.8.0