From 90bcbeac80e2b0f19233bcd4a1b7ace52d576b08 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Feb 2021 17:17:50 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 79f8b3b..edba4e0 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
@@ -488,6 +488,7 @@
             for (HoldOrderDataModel holdOrderDataModel : list) {
                 ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
                 if (holdOrderEntity == null) {
+                    log.info("持仓不存在:{}", holdOrderDataModel.getId());
                     continue;
                 }
 
@@ -503,7 +504,7 @@
 
                 BigDecimal rewardRatio = holdOrderDataModel.getRewardAmount().divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
                 contractOrderEntity.setRewardRatio(rewardRatio);
-                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().negate()));
+                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate()));
                 contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
                 contractOrderEntity.setForceClosingPrice(CalculateUtil.getForceSetPriceForWhole(holdOrderDataModel.getSymbol(), memberEntity));
 
@@ -527,6 +528,8 @@
             }
 
             memberWalletContractDao.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalAmount).negate(), null, wallet.getId());
+        } else {
+            log.info("参数有误:{}", memberEntity.getId());
         }
     }
 

--
Gitblit v1.9.1