From d23645e976981bc9b670eea1d469fe8a36be309c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 17 Apr 2024 17:19:53 +0800
Subject: [PATCH] 55测试环境
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 f44934b..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());
@@ -536,7 +537,7 @@
continue;
}
-// holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity, holdOrderDataModel.getSymbol()));
+ holdOrderEntity.setStopLossPrice(CalculateUtil.calWholePriceTwo(memberEntity, holdOrderEntity, 2));
contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
@@ -552,7 +553,6 @@
contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getHoldBond().negate()));
contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
- contractOrderEntity.setStopProfitPrice(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrderEntity));
// 订单状态转换
if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
--
Gitblit v1.9.1