From 1608d972140b90b6645e53c177de9bf7929735f6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 11:12:32 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 249a3e3..39ffa37 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
@@ -487,6 +487,7 @@
String nickname = followTraderInfoEntity.getNickname();
documentaryOrderSetInfoVo.setNickname(nickname);
+ documentaryOrderSetInfoVo.setProfit(followTraderInfoEntity.getProfitRatio());
if (followFollowerSettingEntity == null) {
return Result.ok(documentaryOrderSetInfoVo);
}
@@ -529,11 +530,24 @@
Long traderId = updateDocumentaryOrderSetDto.getTraderId();
//更新【跟随者设置】数据
FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
- followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
- followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
- followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
- followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingDao.updateById(followFollowerSettingEntity);
+ if (followFollowerSettingEntity == null) {
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectById(traderId);
+ followFollowerSettingEntity = new FollowFollowerSettingEntity();
+ followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingEntity.setTradeId(traderId);
+ followFollowerSettingEntity.setMemberId(memberId);
+ followFollowerSettingEntity.setTradeMemberId(traderInfoEntity.getMemberId());
+ followFollowerSettingDao.insert(followFollowerSettingEntity);
+ } else {
+ followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingDao.updateById(followFollowerSettingEntity);
+ }
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -568,8 +582,9 @@
columnMap.put("member_id", memberId);
List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
if(CollUtil.isNotEmpty(selectByMap)) {
- return Result.fail("submit_repeat");
+ return Result.fail(MessageSourceUtils.getString("submit_repeat"));
}
+
//新增【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
followTraderInfoEntity.setMemberId(memberId);
--
Gitblit v1.9.1