From 568d033e0cca67b0ceb8d4106850c97dbd36f373 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 06 Aug 2020 11:55:19 +0800
Subject: [PATCH] 20200806  代码提交

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    8 ++++----
 1 files changed, 4 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 7bf3550..ca11dda 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
@@ -143,6 +143,9 @@
                 }
             }
 
+            // 盈亏比例(回报率)
+            BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
+
             FollowTraderInfoEntity traderInfoEntity = null;
             // 判断当前订单是否为跟单
             if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
@@ -151,7 +154,7 @@
                     traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
                     if (profitOrLoss.compareTo(BigDecimal.ZERO) > 0) {
                         // 计算需返利给交易员的金额
-                        BigDecimal returnMoney = profitOrLoss.subtract(traderInfoEntity.getProfitRatio());
+                        BigDecimal returnMoney = profitOrLoss.multiply(traderInfoEntity.getProfitRatio());
                         profitOrLoss = profitOrLoss.subtract(returnMoney);
                         MemberWalletContractEntity traderWallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(traderInfoEntity.getMemberId(), CoinTypeEnum.USDT.name());
                         memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
@@ -159,9 +162,6 @@
                     }
                 }
             }
-
-            // 盈亏比例(回报率)
-            BigDecimal rewardRatio = profitOrLoss.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
 
             ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
             contractOrderEntity.setId(null);

--
Gitblit v1.9.1