From cdf75ee88f261d7c1344cd856c03e8c9611f032c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 05 Aug 2020 16:19:51 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java | 2 +
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 47 +++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java | 6 ++
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 2
src/main/resources/mapper/documentary/FollowTraderInfoDao.xml | 7 +++
src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderProfitDetailEntity.java | 14 ++++++
6 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index 0ae1e39..2382163 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.OrderClosingTypeEnum;
import com.xcong.excoin.common.system.service.CommonService;
@@ -10,8 +11,14 @@
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.mapper.ContractHoldOrderEntityMapper;
import com.xcong.excoin.modules.contract.service.RabbitOrderService;
+import com.xcong.excoin.modules.documentary.common.NoticeConstant;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
+import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;
+import com.xcong.excoin.modules.documentary.dao.FollowTraderProfitDetailDao;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitDetailEntity;
import com.xcong.excoin.modules.documentary.service.FollowOrderOperationService;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
@@ -65,6 +72,10 @@
private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
@Resource
private FollowOrderOperationService followOrderOperationService;
+ @Resource
+ private FollowTraderInfoDao followTraderInfoDao;
+ @Resource
+ private FollowTraderProfitDetailDao followTraderProfitDetailDao;
@Transactional(rollbackFor = Exception.class)
@Override
@@ -127,6 +138,23 @@
}
}
+ FollowTraderInfoEntity traderInfoEntity = null;
+ // 判断当前订单是否为跟单
+ if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
+ // 若不为交易员，则计算跟随者订单返利
+ if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
+ if (profitOrLoss.compareTo(BigDecimal.ZERO) > 0) {
+ // 计算需返利给交易员的金额
+ BigDecimal returnMoney = profitOrLoss.subtract(traderInfoEntity.getProfitRatio());
+ profitOrLoss = profitOrLoss.subtract(returnMoney);
+ MemberWalletContractEntity traderWallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(traderInfoEntity.getMemberId(), CoinTypeEnum.USDT.name());
+ memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
+ insertReturnProfitDetail(traderInfoEntity.getMemberId(), memberEntity.getId(), returnMoney, holdOrderEntity.getOrderNo());
+ }
+ }
+ }
+
// 盈亏比例(回报率)
BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
@@ -158,6 +186,8 @@
// 若为交易员，则平仓跟随者订单
if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
+ } else {
+ LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice(), profitOrLoss));
}
}
}
@@ -178,4 +208,21 @@
followFollowerOrderRelationDao.updateById(orderRelationEntity);
}
}
+
+ /**
+ * 插入跟单返利明细
+ *
+ * @param memberId 交易员会员ID
+ * @param followMemberId 跟随者会员ID
+ * @param amount 返利金额
+ * @param orderNo 订单编号
+ */
+ public void insertReturnProfitDetail(Long memberId, Long followMemberId, BigDecimal amount, String orderNo) {
+ FollowTraderProfitDetailEntity profitDetailEntity = new FollowTraderProfitDetailEntity();
+ profitDetailEntity.setMemberId(memberId);
+ profitDetailEntity.setFollowMemberId(followMemberId);
+ profitDetailEntity.setAmount(amount);
+ profitDetailEntity.setOrderNo(orderNo);
+ followTraderProfitDetailDao.insert(profitDetailEntity);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java b/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java
index 3bc76a0..693f01a 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/common/NoticeConstant.java
@@ -6,7 +6,7 @@
**/
public class NoticeConstant {
- public static final String OPEN_ORDER_TITLE = "跟单开仓成功";
+ public static final String OPEN_ORDER_TITLE = "跟单-开仓成功";
public static final String OPEN_ORDER_CONTENT = "{}开仓成功，开仓价{}，交易员{}";
@@ -14,4 +14,8 @@
public static final String OPEN_ORDER_FOLLOW_FAIL_CONTENT = "达到您设置的最大持仓未能跟随交易员{}开仓";
+ public static final String CLOSE_ORDER_TITLE = "跟单-平仓成功";
+
+ public static final String CLOSE_ORDER_CONTENT = "{}平仓成功，平仓价{}，收益{}, 交易员{}";
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java
index 6daeec0..93904e6 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java
@@ -11,4 +11,6 @@
FollowTraderInfoEntity selectTraderInfoByMemberId(@Param("memberId") Long memberId);
+ FollowTraderInfoEntity selectTraderInfoByOrderId(@Param("orderId") Long orderId);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderProfitDetailEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderProfitDetailEntity.java
index a949057..540163d 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderProfitDetailEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderProfitDetailEntity.java
@@ -6,15 +6,27 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
/**
* 交易员收益返利明细
*/
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("follow_trader_profit_detail")
-public class FollowTraderProfitDetailEntity extends BaseEntity{/**
+public class FollowTraderProfitDetailEntity extends BaseEntity{
+
+ /**
*
*/
private static final long serialVersionUID = 1L;
+ private Long memberId;
+
+ private Long followMemberId;
+
+ private BigDecimal amount;
+
+ private String orderNo;
+
}
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 efd2fb6..24a6252 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
@@ -369,7 +369,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);
}
diff --git a/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml b/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
index aee0491..4b32266 100644
--- a/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
+++ b/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
@@ -10,4 +10,11 @@
<select id="selectTraderInfoByMemberId" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity">
select * from follow_trader_info where member_id=#{memberId}
</select>
+
+
+ <select id="selectTraderInfoByOrderId" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity">
+ select a.*
+ from follow_trader_info a, follow_follower_order_relation b
+ where a.member_id=b.trade_member_id and b.order_id=#{orderId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1