From e16ab23cc4b872436edf3743f7e9e5639c45d770 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 15:40:59 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 9ff4d66..1d8078e 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
@@ -128,6 +128,7 @@
}
} catch (Exception e) {
log.error("平仓异常", e);
+ throw e;
}
}
@@ -181,12 +182,12 @@
// 盈亏比例(回报率)
BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
- FollowTraderInfoEntity traderInfoEntity = null;
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
// 判断当前订单是否为跟单
if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
- // 若不为交易员，则计算跟随者订单返利
- if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
- traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
+ // 若不为交易员且不是测试账号，则计算跟随者订单返利
+ if (!MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader()) &&
+ !MemberEntity.ACCOUNT_TYPE_TEST.equals(memberEntity.getAccountType())) {
if (profitOrLoss.compareTo(BigDecimal.ZERO) > 0) {
// 计算需返利给交易员的金额
BigDecimal returnMoney = profitOrLoss.multiply(traderInfoEntity.getProfitRatio());
--
Gitblit v1.9.1