From c88a15817dad5ee098d7927d614148405a05a5f0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 16:23:11 +0800
Subject: [PATCH] modify add follow order
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 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 48b666d..84e9ac9 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
@@ -23,6 +23,7 @@
import com.xcong.excoin.modules.coin.dao.OrderCoinsDao;
import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
+import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerNoticeDao;
@@ -102,6 +103,8 @@
@Resource
private ContractHoldOrderDao contractHoldOrderDao;
@Resource
+ private ContractOrderDao contractOrderDao;
+ @Resource
private MemberLevelRateDao memberLevelRateDao;
@Resource
private MemberWalletContractDao memberWalletContractDao;
@@ -109,7 +112,7 @@
private FollowFollowerSettingDao followFollowerSettingDao;
@Resource
private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
-
+ @Resource
private FollowFollowerNoticeDao followFollowerNoticeDao;
@@ -610,7 +613,7 @@
FollowTraderProfitInfoVo followTraderProfitInfoVo = followTraderProfitInfoDao.selectOneByMemberId(memberId);
MemberEntity user = LoginUserUtils.getUser();
if(ObjectUtil.isNotEmpty(user)) {
- FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(memberId, traderId);
+ FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitDao.selectDocumentaryOrderSetInfoBymemberIdAndTradeId(user.getId(), traderId);
if(ObjectUtil.isNotEmpty(followFollowerProfitEntity)) {
followTraderProfitInfoVo.setDocumentaryType(followFollowerProfitEntity.getIsFollow());
}else {
@@ -638,6 +641,16 @@
if(MemberEntity.CERTIFY_STATUS_Y != certifyStatus) {
return Result.fail(MessageSourceUtils.getString("member_controller_0009"));
}
+
+ //不可以处于跟单状态
+ 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"));
+ }
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
List<FollowTraderInfoEntity> selectByMap = followTraderInfoDao.selectByMap(columnMap);
@@ -648,7 +661,8 @@
//新增【交易员信息表】数据
FollowTraderInfoEntity followTraderInfoEntity = new FollowTraderInfoEntity();
followTraderInfoEntity.setMemberId(memberId);
- followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);
+ followTraderInfoEntity.setProfitRatio(BigDecimal.valueOf(0.1));
+// followTraderInfoEntity.setAvatar(FollowTraderInfoEntity.AVATAR_DEFAULT);
String phone = memberEntity.getPhone();
String email = memberEntity.getEmail();
if(StrUtil.isNotEmpty(phone)) {
@@ -824,7 +838,7 @@
// 回报率
BigDecimal returnRate = rewardRatio.divide(contractHoldOrderEntity.getBondAmount().subtract(contractHoldOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
- myFollowOrderVo.setRewardRatio(returnRate.setScale(2, BigDecimal.ROUND_DOWN));
+ myFollowOrderVo.setRewardRatio(returnRate.setScale(4, BigDecimal.ROUND_DOWN));
myFollowOrderVos.add(myFollowOrderVo);
}
@@ -846,11 +860,41 @@
if(CollUtil.isNotEmpty(records)) {
for(ContractOrderEntity contractOrderEntity : records) {
TradeHistoryOrderInfoVo myFollowOrderVo = new TradeHistoryOrderInfoVo();
+ //获取【跟随者-订单关联表】中的累计数据
+ BigDecimal allRewardAmount = BigDecimal.ZERO;
+ BigDecimal allRewardRatio = BigDecimal.ZERO;
+
+ Long orderId = contractOrderEntity.getId();
+ Map<String, Object> columnMapRelation = new HashMap<>();
+ columnMapRelation.put("trade_order_no", orderId);
+ columnMapRelation.put("trade_member_id", memberId);
+ columnMapRelation.put("order_type", 2);
+ columnMapRelation.put("is_show", 1);
+ List<FollowFollowerOrderRelationEntity> followFollowerOrderRelations = followFollowerOrderRelationDao.selectByMap(columnMapRelation);
+ if(CollUtil.isNotEmpty(followFollowerOrderRelations)) {
+ int size = followFollowerOrderRelations.size() - 1;
+ myFollowOrderVo.setFollowerNumber(size);
+ for(FollowFollowerOrderRelationEntity followFollowerOrderRelation : followFollowerOrderRelations) {
+ Long followerMemberId = followFollowerOrderRelation.getMemberId();
+ if(!memberId.equals(followerMemberId)) {
+ Long followerOrderId = followFollowerOrderRelation.getOrderId();
+ ContractOrderEntity orderEntity = contractOrderDao.selectById(followerOrderId);
+ BigDecimal rewardAmount = orderEntity.getRewardAmount();
+ allRewardAmount = allRewardAmount.add(rewardAmount);
+ BigDecimal rewardRatio = orderEntity.getRewardRatio();
+ allRewardRatio = allRewardRatio.add(rewardRatio);
+ }
+ }
+ }else {
+ myFollowOrderVo.setFollowerNumber(0);
+ }
+ myFollowOrderVo.setFollowerRewardAmount(allRewardAmount);
+ myFollowOrderVo.setFollowerRewardRatio(allRewardRatio);
+
//获取交易员信息
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
String nickname = followTraderInfoEntity.getNickname();
myFollowOrderVo.setNickname(nickname);
- Long orderId = contractOrderEntity.getId();
myFollowOrderVo.setOrderId(orderId);
String symbol = contractOrderEntity.getSymbol();
myFollowOrderVo.setSymbol(symbol);
--
Gitblit v1.9.1