From ea8eb9c441bb4452d153579b456467b2f5e958e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 04 Aug 2020 16:15:54 +0800
Subject: [PATCH] add trader closing order
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 4f4cbc2..5e5781b 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
@@ -134,12 +134,10 @@
Long memberId = user.getId();
FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
- FollowTraderProfitInfoVo.setDocumentaaryType(1);
+ FollowTraderProfitInfoVo.setDocumentaaryType(followFollowerProfitEntity.getIsFollow());
}else {
- FollowTraderProfitInfoVo.setDocumentaaryType(2);
- }
- }else {
- FollowTraderProfitInfoVo.setDocumentaaryType(2);
+ FollowTraderProfitInfoVo.setDocumentaaryType(2);
+ }
}
Long traderId = FollowTraderProfitInfoVo.getTraderId();
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectFollowTraderInfoEntityBytreaderId(traderId);
@@ -394,6 +392,8 @@
myFollowTraderInfoVo.setTotalPrincipal(totalPrincipal);
BigDecimal totalProfit = FollowFollowerProfitEntity.getTotalProfit();
myFollowTraderInfoVo.setTotalProfit(totalProfit.setScale(2, BigDecimal.ROUND_DOWN));
+
+ myFollowTraderInfoVo.setTradeId(tradeId);
myFollowOrderVos.add(myFollowTraderInfoVo);
}
}
@@ -475,12 +475,11 @@
followFollowerProfitDao.insert(followFollowerProfitEntity);
}
} else {
- FollowFollowerSettingEntity followFollowerSettingEntity = new FollowFollowerSettingEntity();
- followFollowerSettingEntity.setSymbols(documentaryOrderSetDto.getSymbols());
- followFollowerSettingEntity.setFollowType(documentaryOrderSetDto.getFollowType());
- followFollowerSettingEntity.setFollowCnt(documentaryOrderSetDto.getFollowCnt());
- followFollowerSettingEntity.setMaxFollowCnt(documentaryOrderSetDto.getMaxFollowCnt());
- followFollowerSettingDao.updateById(followFollowerSettingEntity);
+ 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"));
}
@@ -535,7 +534,7 @@
FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId,traderId);
followFollowerProfitEntity.setIsFollow(FollowFollowerProfitEntity.IS_FOLLOW_N);
followFollowerProfitDao.updateById(followFollowerProfitEntity);
- return null;
+ return Result.ok(MessageSourceUtils.getString("documentary_service_0011"));
}
@Override
--
Gitblit v1.9.1