From d61072f997839b4564ce35132d5902a1b6f7d54f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 17:39:10 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 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 39ffa37..1f503fb 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
@@ -394,6 +394,8 @@
myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+
+ myFollowTraderInfoVo.setTradeId(tradeId);
myFollowOrderVos.add(myFollowTraderInfoVo);
}
}
@@ -435,37 +437,52 @@
public Result getDocumentaryOrderSet(@Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- //新增【跟随者设置】数据
- FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
- followFollowerSettingEntity.setMemberId(memberId);
- Long traderId = documentaryOrderSetDto.getTraderId();
- followFollowerSettingEntity.setTradeId(traderId);
- FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
- Long traderMemberId = followTraderInfoEntity.getMemberId();
- followFollowerSettingEntity.setTradeMemberId(traderMemberId);
- followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
- followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
- followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
- followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingDao.insert(followFollowerSettingEntity);
- //更新【跟随者收益】数据
- Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("member_id", memberId);
- List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
- if(CollUtil.isNotEmpty(selectByMap)) {
- FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
- followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
- followFollowerProfitDao.updateById(followFollowerProfitEntity);
- }else {
- FollowFollowerProfitEntity followFollowerProfitEntity = new FollowFollowerProfitEntity();
- followFollowerProfitEntity.setMemberId(memberId);
- followFollowerProfitEntity.setTradeId(traderId);
- followFollowerProfitEntity.setTradeMemberId(traderMemberId);
- followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
- followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
- followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
- followFollowerProfitDao.insert(followFollowerProfitEntity);
- }
+ Long traderId = documentaryOrderSetDto.getTraderId();
+
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
+ if (traderInfoEntity != null) {
+ return Result.fail("交易员不能进行跟单");
+ }
+
+ FollowFollowerSettingEntity isExistSetting = followFollowerSettingDao.selectOneBymemberIdAndTradeId(memberId, traderId);
+ if (isExistSetting == null) {
+ //新增【跟随者设置】数据
+ FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
+ followFollowerSettingEntity.setMemberId(memberId);
+ followFollowerSettingEntity.setTraderId(traderId);
+ FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(traderId);
+ Long traderMemberId = followTraderInfoEntity.getMemberId();
+ followFollowerSettingEntity.setTraderMemberId(traderMemberId);
+ followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
+ followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
+ followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
+ followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingDao.insert(followFollowerSettingEntity);
+ //更新【跟随者收益】数据
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<FollowFollowerProfitEntity> selectByMap = followFollowerProfitDao.selectByMap(columnMap);
+ if (CollUtil.isNotEmpty(selectByMap)) {
+ FollowFollowerProfitEntity followFollowerProfitEntity = selectByMap.get(0);
+ followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ followFollowerProfitDao.updateById(followFollowerProfitEntity);
+ } else {
+ FollowFollowerProfitEntity followFollowerProfitEntity = new FollowFollowerProfitEntity();
+ followFollowerProfitEntity.setMemberId(memberId);
+ followFollowerProfitEntity.setTradeId(traderId);
+ followFollowerProfitEntity.setTradeMemberId(traderMemberId);
+ followFollowerProfitEntity.setTotalPrincipal(BigDecimal.ZERO);
+ followFollowerProfitEntity.setTotalProfit(BigDecimal.ZERO);
+ followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_Y);
+ followFollowerProfitDao.insert(followFollowerProfitEntity);
+ }
+ } else {
+ isExistSetting.setSymbols(documentaryOrderSetDto.getSymbols());
+ isExistSetting.setFollowType(documentaryOrderSetDto.getFollowType());
+ isExistSetting.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
+ isExistSetting.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
+ followFollowerSettingDao.updateById(isExistSetting);
+ }
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -537,9 +554,9 @@
followFollowerSettingEntity.setFollowType(updateDocumentaryOrderSetDto.getFollowType());
followFollowerSettingEntity.setFollowCnt(updateDocumentaryOrderSetDto.getFollowCnt());
followFollowerSettingEntity.setMaxFollowCnt(updateDocumentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingEntity.setTradeId(traderId);
+ followFollowerSettingEntity.setTraderId(traderId);
followFollowerSettingEntity.setMemberId(memberId);
- followFollowerSettingEntity.setTradeMemberId(traderInfoEntity.getMemberId());
+ followFollowerSettingEntity.setTraderMemberId(traderInfoEntity.getMemberId());
followFollowerSettingDao.insert(followFollowerSettingEntity);
} else {
followFollowerSettingEntity.setSymbols(updateDocumentaryOrderSetDto.getSymbols());
--
Gitblit v1.9.1