From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index af809d3..d6c5c3c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -195,7 +195,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
@@ -244,6 +244,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -295,7 +296,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -344,6 +345,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -396,7 +398,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
@@ -442,6 +444,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -493,7 +496,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -539,6 +542,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -619,6 +623,7 @@
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
+ contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -700,6 +705,7 @@
holdOrderEntity.setOperateNo(1);
// 设置合约类型
holdOrderEntity.setContractType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
+ holdOrderEntity.setHoldBond(CalculateUtil.calMemberHoldBond(holdOrderEntity));
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setOpeningTime(new Date());
@@ -710,6 +716,8 @@
if (isSuccess) {
contractEntrustOrderService.removeById(entrustOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
+
+ ThreadPoolUtils.sendWholePrice(member.getId());
// 发送强平价
ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrder.getSymbol(), member);
@@ -764,6 +772,7 @@
*
* @param
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealCoinOut(List<ContractHoldOrderEntity> orderList, List<OrderModel> orderModels) {
if (CollectionUtils.isNotEmpty(orderList)) {
Map<Long, Integer> modelMap = new HashMap<Long, Integer>();
@@ -794,7 +803,7 @@
bombOrder(holdOrderEntity);
}
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(coinsOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(coinsOrder.getMemberId(), CoinTypeEnum.USDT.name());
// 流水记录 TODO
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
@@ -855,7 +864,7 @@
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
- MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
+ MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeEnum.USDT.name());
// 减去的时候用负数
BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -872,7 +881,7 @@
record.setPrice(coinsOrder.getBondAmount());
memberAccountFlowEntityDao.insert(record);
} else {
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
// BigDecimal rewardRatio = BigDecimal.ZERO;
// // 开多
--
Gitblit v1.9.1