From 4e43b6496e163787ea7397ca422c9e081ac2857a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Feb 2021 15:42:32 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 23d1783..de44524 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -176,16 +176,15 @@
         		
         		String labels = followTraderInfoEntity.getLabels();
         		if(StrUtil.isNotEmpty(labels)) {
-        			String labelsName = "";
+        			ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();
         			String[] split = labels.split(",");
         			int length = split.length;
         			for(int i = 0;i < length;i++) {
         				String string = split[i];
         				FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));
-        				labelsName = selectById.getLabels();
-        				labelsName += (labelsName + ",");
+        				arrayList.add(selectById);
         			}
-        			FollowTraderProfitInfoVo.setLabels(labelsName);
+        			FollowTraderProfitInfoVo.setLabels(arrayList);
         		}
         		
         	}
@@ -194,7 +193,7 @@
 	}
 	
 	public static void main(String[] args) {
-		String labels = "";
+		String labels = "1,2,3";
 		if(StrUtil.isNotEmpty(labels)) {
 			String labelsName = "";
 			String[] split = labels.split(",");
@@ -727,9 +726,9 @@
         String phone = memberEntity.getPhone();
         String email = memberEntity.getEmail();
         if(StrUtil.isNotEmpty(phone)) {
-        	followTraderInfoEntity.setNickname(phone);
+        	followTraderInfoEntity.setNickname(phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
         }else {
-        	followTraderInfoEntity.setNickname(email);
+        	followTraderInfoEntity.setNickname(email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)","$1****$3$4"));
         }
         followTraderInfoEntity.setDeclaration(FollowTraderInfoEntity.DECLARATION_DEFAULT);
         followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);
@@ -784,16 +783,15 @@
         
         String labels = followTraderInfoEntity.getLabels();
 		if(StrUtil.isNotEmpty(labels)) {
-			String labelsName = "";
+			ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();
 			String[] split = labels.split(",");
 			int length = split.length;
 			for(int i = 0;i < length;i++) {
 				String string = split[i];
 				FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));
-				labelsName = selectById.getLabels();
-				labelsName += (labelsName + ",");
+				arrayList.add(selectById);
 			}
-			tradeSetInfoVo.setLabels(labelsName);
+			tradeSetInfoVo.setFollowTraderLabelEntitys(arrayList);
 		}
 		return Result.ok(tradeSetInfoVo);
 	}

--
Gitblit v1.9.1