From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
index 2f5748f..c4703ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -97,8 +97,7 @@
 			String orderId = msg.getOrderId();
 			MsgTypeOrderTypeEnum type = msg.getType();
 			if (type == MsgTypeOrderTypeEnum.invite || type == MsgTypeOrderTypeEnum.share) {
-				orderId = orderId.substring(0, orderId.length() - 6);
-				orderId = orderId + "******";
+				orderId = UserUtil.filterOrderId(orderId);
 			}
 			contentList = new ArrayList<>();
 			contentList.add(new ClientTextStyleVO(orderId, COLOR_CONTENT));
@@ -236,7 +235,7 @@
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();
-			contentList.add(new ClientTextStyleVO("楼楠岃瘉鎴愬姛", COLOR_HIGHLIGHT_CONTENT));
+			contentList.add(new ClientTextStyleVO("楠岃瘉鎴愬姛", COLOR_HIGHLIGHT_CONTENT));
 			items.add(new CommonMsgItemVO(new ClientTextStyleVO("楠岃瘉鐘舵��", COLOR_TITLE), contentList));
 
 			contentList = new ArrayList<>();

--
Gitblit v1.8.0