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/config/push/PushMsgFactory.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..1519e82 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,7 +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("[璁㈠崟鍙穄",UserUtil.filterOrderId(orderId))
.replace("[閲戦]", money.toString());
return new PushContentDTO(title, content);
}
@@ -55,7 +55,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("[璁㈠崟鍙穄",UserUtil.filterOrderId(orderId))
.replace("[閲戦]", money.toString());
return new PushContentDTO(title, content);
}
@@ -180,7 +180,7 @@
String title = Constant.znxConfig.getMoneyWeiquanTitle();
String content = Constant.znxConfig.getMoneyWeiquanMsg();
content = content.replace("[璁㈠崟绫诲瀷]", Constant.getSourceName(sourceType))
- .replace("[璁㈠崟鍙穄", orderId.substring(0, orderId.length() - 6) + "******")
+ .replace("[璁㈠崟鍙穄", UserUtil.filterOrderId(orderId))
.replace("[閮ㄥ垎]", part ? "閮ㄥ垎" : "").replace("[閲戦]", money.toString());
return new PushContentDTO(title, content);
}
--
Gitblit v1.8.0