From b213bda26a73e098880939ed36911cf25693e9d6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Sep 2020 15:00:04 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 449dc44..a3462b1 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
@@ -259,7 +259,7 @@
MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(symbol));
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
if (walletContract != null) {
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
// 盈亏
@@ -318,7 +318,7 @@
contractOrderEntity.setClosingType(closingType);
contractOrderEntity.setSymbolCnt(closeCnt);
contractOrderEntity.setRewardAmount(profitOrLoss);
- contractOrderEntity.setBondAmount(bondAmount);
+ contractOrderEntity.setBondAmount(bondAmount.add(fee));
contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
@@ -380,7 +380,7 @@
String symbol = entrustOrder.getSymbol();
MemberEntity memberEntity = memberDao.selectById(memberId);
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(symbol));
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
@@ -467,4 +467,25 @@
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
+
+
+ @Override
+ public void wholeBombOrder(List<OrderModel> list) {
+
+ for (OrderModel orderModel : list) {
+ MemberEntity memberEntity = memberDao.selectById(orderModel.getMemberId());
+ Long memberId = memberEntity.getId();
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null);
+
+ BigDecimal currentPrice = new BigDecimal(orderModel.getPrice());
+ if (CollUtil.isNotEmpty(holdOrderEntities)) {
+
+ for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+
+ }
+ } else {
+ log.info("无当前持仓");
+ }
+ }
+ }
}
--
Gitblit v1.9.1