From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 f75401d..a0ef098 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
@@ -637,6 +637,7 @@
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
+ contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -651,11 +652,11 @@
// 市价
if (coinsCoinsOrder.getEntrustType() == 1) {
// 开多
- OrderModel model = new OrderModel(contractHoldOrderEntity.getId(), 6, contractHoldOrderEntity.getForceClosingPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), coinsCoinsOrder.getSymbol(), 1);
+ OrderModel model = new OrderModel(contractHoldOrderEntity.getId(), 6, contractHoldOrderEntity.getForceClosingPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), coinsCoinsOrder.getSymbol(), 1, coinsCoinsOrder.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
} else {
// 开空
- OrderModel model = new OrderModel(contractHoldOrderEntity.getId(), 7, contractHoldOrderEntity.getForceClosingPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), coinsCoinsOrder.getSymbol(), 1);
+ OrderModel model = new OrderModel(contractHoldOrderEntity.getId(), 7, contractHoldOrderEntity.getForceClosingPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), coinsCoinsOrder.getSymbol(), 1, coinsCoinsOrder.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 扣除手续费
@@ -671,6 +672,21 @@
private void wholeEntrustOrder(ContractEntrustOrderEntity entrustOrder) {
log.info("全仓委托逻辑处理:{}", entrustOrder.getOrderNo());
+
+ int i = 1;
+ while (true) {
+ List<Object> types = redisUtils.lGet(AppContants.MEMBER_TYPE + entrustOrder.getMemberId(), 0, -1);
+ if (CollUtil.isEmpty(types)) {
+ break;
+ }
+ log.info("存在止盈/止损/爆仓/委托平仓，等待 -- {}", i);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ i++;
+ }
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrder.getSymbol()));
PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
@@ -695,7 +711,7 @@
}
holdOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCnt());
+ holdOrderEntity.setSymbolCntSale(entrustOrder.getSymbolCnt());
holdOrderEntity.setOpeningFeeAmount(openFeePrice);
holdOrderEntity.setOpeningPrice(entrustOrder.getEntrustPrice());
holdOrderEntity.setMarkPrice(entrustOrder.getEntrustPrice());
@@ -877,21 +893,30 @@
} else {
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
- BigDecimal rewardRatio = BigDecimal.ZERO;
- // 开多
- if (ContractHoldOrderEntity.OPENING_TYPE_MORE == coinsOrder.getOpeningType()) {
- // (最新价-开仓价)*规格*张数
- rewardRatio = nowPrice.subtract(coinsOrder.getOpeningPrice()).multiply(coinsOrder.getSymbolSku()).multiply(new BigDecimal(coinsOrder.getSymbolCntSale()));
- // 开空
- } else {
- // (开仓价-最新价)*规格*张数
- rewardRatio = coinsOrder.getOpeningPrice().subtract(nowPrice).multiply(coinsOrder.getSymbolSku()).multiply(new BigDecimal(coinsOrder.getSymbolCntSale()));
+// BigDecimal rewardRatio = BigDecimal.ZERO;
+// // 开多
+// if (ContractHoldOrderEntity.OPENING_TYPE_MORE == coinsOrder.getOpeningType()) {
+// // (最新价-开仓价)*规格*张数
+// rewardRatio = nowPrice.subtract(coinsOrder.getOpeningPrice()).multiply(coinsOrder.getSymbolSku()).multiply(new BigDecimal(coinsOrder.getSymbolCntSale()));
+// // 开空
+// } else {
+// // (开仓价-最新价)*规格*张数
+// rewardRatio = coinsOrder.getOpeningPrice().subtract(nowPrice).multiply(coinsOrder.getSymbolSku()).multiply(new BigDecimal(coinsOrder.getSymbolCntSale()));
+// }
+
+ // 委托单总委托金额
+ BigDecimal totalPrePayment = BigDecimal.ZERO;
+ List<ContractEntrustOrderEntity> entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memId);
+ if (CollUtil.isNotEmpty(entrustOrderEntities)) {
+ for (ContractEntrustOrderEntity entrustOrderEntity : entrustOrderEntities) {
+ totalPrePayment = totalPrePayment.add(entrustOrderEntity.getEntrustAmount());
+ }
}
- contractOrderEntity.setRewardAmount(rewardRatio);
+ contractOrderEntity.setRewardAmount(wallet.getTotalBalance().subtract(totalPrePayment).subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
contractOrderService.save(contractOrderEntity);
- memberWalletContractService.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().negate(), null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalPrePayment).negate(), null, wallet.getId());
}
}
}
--
Gitblit v1.9.1