From 51729c6b98fefd687ecf275fb444d447881d155e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 16:34:24 +0800
Subject: [PATCH] 20210304 跟单一次跟一个
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 adae729..92712d1 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
@@ -511,15 +511,6 @@
return Result.fail(MessageSourceUtils.getString("documentary_service_0014"));
}
- //不可以处于跟单状态
- Map<String, Object> columnMaps = new HashMap<>();
- columnMaps.put("member_id", memberId);
- columnMaps.put("is_follow", 1);
- List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
- if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
- return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
- }
-
//判断当前用户是否是逐仓模式
MemberEntity selectById2 = memberDao.selectById(memberId);
Integer contractPositionType = selectById2.getContractPositionType();
@@ -607,15 +598,14 @@
DocumentaryOrderSetInfoVo documentaryOrderSetInfoVo = new DocumentaryOrderSetInfoVo();
long parseLong = Long.parseLong(tradeId);
- //不可以处于跟单状态
+ //只能跟随一个人
Map<String, Object> columnMaps = new HashMap<>();
columnMaps.put("member_id", memberId);
- columnMaps.put("is_follow", 1);
- List<FollowFollowerProfitEntity> followFollowerProfitEntitys = followFollowerProfitDao.selectByMap(columnMaps);
- if(CollUtil.isNotEmpty(followFollowerProfitEntitys)) {
- for(FollowFollowerProfitEntity followFollowerProfitEntityAllow : followFollowerProfitEntitys) {
- Long tradeIdAllow = followFollowerProfitEntityAllow.getTradeId();
- if(!tradeIdAllow.equals(parseLong)) {
+ List<FollowFollowerSettingEntity> followFollowerSettingEntityAllows = followFollowerSettingDao.selectByMap(columnMaps);
+ if(CollUtil.isNotEmpty(followFollowerSettingEntityAllows)) {
+ for(FollowFollowerSettingEntity followFollowerSettingEntityAllow : followFollowerSettingEntityAllows) {
+ Long tradeIdAllow = followFollowerSettingEntityAllow.getTraderId();
+ if(!tradeIdAllow.toString().equals(tradeId)) {
return Result.fail(MessageSourceUtils.getString("documentary_service_0015"));
}
}
@@ -773,6 +763,7 @@
}else {
followTraderInfoEntity.setNickname(email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)","$1****$3$4"));
}
+ followTraderInfoEntity.setNicknameState(FollowTraderInfoEntity.STATE_N);
followTraderInfoEntity.setDeclaration(FollowTraderInfoEntity.DECLARATION_DEFAULT);
followTraderInfoEntity.setIsAll(FollowTraderInfoEntity.IS_ALL_N);
followTraderInfoEntity.setProfitRatio(BigDecimal.ZERO);
@@ -819,6 +810,8 @@
tradeSetInfoVo.setAvatar(avatar);
String nickname = followTraderInfoEntity.getNickname();
tradeSetInfoVo.setNickname(nickname);
+ Integer nicknameState = followTraderInfoEntity.getNicknameState();
+ tradeSetInfoVo.setNicknameState(nicknameState);
String declaration = followTraderInfoEntity.getDeclaration();
tradeSetInfoVo.setDeclaration(declaration);
Integer isOpen = followTraderInfoEntity.getIsOpen();
@@ -853,6 +846,14 @@
String declaration = updateTradeSetInfoDto.getDeclaration();
int isOpen = updateTradeSetInfoDto.getIsOpen();
String labels = updateTradeSetInfoDto.getLabels();
+ Integer nicknameState = followTraderInfoEntity.getNicknameState();
+ if(FollowTraderInfoEntity.STATE_Y == nicknameState && !nickname.equals(followTraderInfoEntity.getNickname())) {
+ return Result.ok(MessageSourceUtils.getString("member_service_0099"));
+ }
+ if(!nickname.equals(followTraderInfoEntity.getNickname())) {
+ followTraderInfoEntity.setNickname(nickname);
+ followTraderInfoEntity.setNicknameState(FollowTraderInfoEntity.STATE_Y);
+ }
followTraderInfoEntity.setLabels(labels);
followTraderInfoEntity.setAvatar(avatar);
followTraderInfoEntity.setNickname(nickname);
--
Gitblit v1.9.1