From 1a5c7cee38f3db0f3ce3bdb9ffe9bc440fbfa3cb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jan 2021 18:00:26 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 94 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 44 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..a48bce9 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
+import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.modules.coin.dao.MemberAccountFlowEntityDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountFlowEntity;
import com.xcong.excoin.modules.contract.dao.ContractEntrustOrderDao;
@@ -185,12 +186,7 @@
// 本次需要退回的保证金
BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
- MemberWalletContractEntity wallet;
- if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
- } else {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
- }
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
if (wallet != null) {
// 历史订单
@@ -199,7 +195,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
@@ -290,12 +286,8 @@
// 本次需要退回的预付款
BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
- MemberWalletContractEntity wallet;
- if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
- } else {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
- }
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
+
if (wallet != null) {
// 历史订单
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(order);
@@ -303,7 +295,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -395,12 +387,7 @@
Long memberId = order.getMemberId();
// 本次需要退回的预付款
BigDecimal prePrice = order.getBondAmount();
- MemberWalletContractEntity wallet;
- if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
- } else {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
- }
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
if (wallet != null) {
// 历史订单
@@ -409,7 +396,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
@@ -497,12 +484,7 @@
Long memberId = order.getMemberId();
// 本次需要退回的预付款
BigDecimal prePrice = order.getBondAmount();
- MemberWalletContractEntity wallet;
- if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
- } else {
- wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
- }
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
if (wallet != null) {
// 历史订单
@@ -511,7 +493,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -651,11 +633,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,7 +653,22 @@
private void wholeEntrustOrder(ContractEntrustOrderEntity entrustOrder) {
log.info("全仓委托逻辑处理:{}", entrustOrder.getOrderNo());
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrder.getSymbol()));
+
+ 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(), CoinTypeEnum.USDT.name());
PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
MemberEntity member = memberService.getById(entrustOrder.getMemberId());
@@ -858,7 +855,7 @@
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
- MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
+ MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
// 减去的时候用负数
BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -875,23 +872,32 @@
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;
- // 开多
- 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