From bd112789a7b5a542fcd9f86f94048165212acf11 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 16:15:28 +0800
Subject: [PATCH] test log print
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 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 e7e6a55..7b30a9f 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
@@ -89,10 +89,15 @@
@Transactional(rollbackFor = Exception.class)
@Override
public void cancelHoldOrder(List<Long> ids) {
+ log.info("--------");
if (CollUtil.isNotEmpty(ids)) {
try {
+ log.info("=========:{}", ids.size());
if (ids.size() == 1) {
+ log.info("------->>>>>>");
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
+
+ log.info(">>>>>>>>>>>>>{}", holdOrderEntity.getPositionType());
// 判断仓位类型是否逐仓
if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
// 逐仓平仓
@@ -254,6 +259,7 @@
* 全仓模式平仓逻辑
*/
public void closingWholeOrder(ContractHoldOrderEntity holdOrderEntity) {
+ log.info("进入全仓模式--平仓");
String symbol = holdOrderEntity.getSymbol();
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
@@ -262,6 +268,7 @@
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
if (walletContract != null) {
+ log.info("--->逻辑");
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
// 盈亏
BigDecimal profitOrLoss = BigDecimal.ZERO;
@@ -296,7 +303,15 @@
profitOrLoss = profitOrLoss.multiply(BigDecimal.ONE.add(tradeSettingEntity.getProfitParam()));
}
}
+ log.info("profitOrLoss:{}", profitOrLoss);
+ // 保证金
+ BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
+
+ log.info("bondAmount:{}", bondAmount);
+ // 平仓手续费
+ BigDecimal fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ log.info("fee:{}", fee);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setId(null);
contractOrderEntity.setClosingPrice(newPrice);
@@ -304,11 +319,25 @@
contractOrderEntity.setClosingType(closingType);
contractOrderEntity.setSymbolCnt(closeCnt);
contractOrderEntity.setRewardAmount(profitOrLoss);
+ contractOrderEntity.setBondAmount(bondAmount);
+ contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
- contractHoldOrderDao.updateById(holdOrderEntity);
- }
+ if (holdOrderEntity.getSymbolCntSale() - closeCnt != 0) {
+ holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
+ contractHoldOrderDao.updateById(holdOrderEntity);
+ } else {
+ contractHoldOrderDao.deleteById(holdOrderEntity.getId());
+ }
+ BigDecimal changeAmount = profitOrLoss.add(bondAmount).subtract(fee);
+
+ memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, fee.negate(), null, walletContract.getId());
+
+ ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
+ // 计算佣金
+ ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ }
}
}
--
Gitblit v1.9.1