From a8bc04c1c9270a2a7f28d6113bc6f097496c50aa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 14:40:25 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 44af655..f77b3a2 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(",");
@@ -222,7 +221,8 @@
historyOrderRecordsVo.setClosingPrice(closingPrice);
BigDecimal openingPrice = historyOrderRecordsVo.getOpeningPrice().setScale(2, BigDecimal.ROUND_DOWN);
historyOrderRecordsVo.setOpeningPrice(openingPrice);
- }
+ historyOrderRecordsVo.setClosingTimeStamp(historyOrderRecordsVo.getClosingTime().getTime());
+ }
}
return Result.ok(historyOrderRecordsVoList);
}
@@ -727,9 +727,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);
--
Gitblit v1.9.1