From ec8da058e74bae11d9d67580d9ae0e2e70527ae8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 17:18:33 +0800
Subject: [PATCH] 20210326 交易员列表定时器
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 1dfed81..d8e137b 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
@@ -97,13 +97,17 @@
if (ids.size() == 1) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
- // 判断仓位类型是否逐仓
- if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
- // 逐仓平仓
- cancelHoldOrderMethod(holdOrderEntity);
+ if (holdOrderEntity != null) {
+ // 判断仓位类型是否逐仓
+ if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ // 逐仓平仓
+ cancelHoldOrderMethod(holdOrderEntity);
+ } else {
+ // 全仓模式平仓
+ closingWholeOrder(holdOrderEntity);
+ }
} else {
- // 全仓模式平仓
- closingWholeOrder(holdOrderEntity);
+ log.info("持仓订单为空: {}", ids.get(0));
}
} else {
List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
@@ -181,6 +185,8 @@
MemberWalletContractEntity traderWallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(traderInfoEntity.getMemberId(), CoinTypeEnum.USDT.name());
memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
insertReturnProfitDetail(traderInfoEntity.getMemberId(), memberEntity.getId(), returnMoney, holdOrderEntity.getOrderNo());
+ //增加返佣提醒
+ LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(), NoticeConstant.RETURN_MONEY_TITLE, StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT, holdOrderEntity.getOrderNo(), returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
}
}
}
@@ -214,8 +220,8 @@
if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
} else {
- followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
- LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice(), profitOrLoss.setScale(8, BigDecimal.ROUND_DOWN).toString(), traderInfoEntity.getNickname()));
+ followFollowerProfitDao.updateFollowerProfitByTradeMemberId(holdOrderEntity.getBondAmount(), profitOrLoss, traderInfoEntity.getMemberId(), memberEntity.getId());
+ LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), profitOrLoss.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), traderInfoEntity.getNickname()));
}
}
}
@@ -447,11 +453,13 @@
contractOrderEntity.setEntrustOpeningPrice(newPrice);
contractOrderEntity.setEntrustTime(new Date());
contractOrderEntity.setClosingPrice(newPrice);
+ contractOrderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_LIMIT_PRICE);
contractOrderEntity.setOrderType(entrustOrder.getEntrustType());
contractOrderEntity.setClosingType(closingType);
contractOrderEntity.setSymbolCnt(closeCnt);
contractOrderEntity.setRewardAmount(profitOrLoss);
contractOrderEntity.setBondAmount(bondAmount);
+ contractOrderEntity.setClosingTime(new Date());
contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
--
Gitblit v1.9.1