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 | 162 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 113 insertions(+), 49 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 f26a9b1..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
@@ -1,8 +1,12 @@
package com.xcong.excoin.modules.contract.service.impl;
+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;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
@@ -24,10 +28,7 @@
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.rabbit.producer.OrderProducer;
-import com.xcong.excoin.utils.CacheSettingUtils;
-import com.xcong.excoin.utils.CalculateUtil;
-import com.xcong.excoin.utils.CoinTypeConvert;
-import com.xcong.excoin.utils.ThreadPoolUtils;
+import com.xcong.excoin.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
@@ -75,6 +76,10 @@
private MemberSettingDao memberSettingDao;
@Resource
private ContractHoldOrderDao contractHoldOrderDao;
+ @Resource
+ private ContractEntrustOrderDao contractEntrustOrderDao;
+ @Resource
+ private RedisUtils redisUtils;
public void dealOrderFromMq(List<OrderModel> list, Integer type) {
@@ -131,6 +136,23 @@
}
}
+
+ /**
+ * 止盈/止损后删除全仓委托平仓单
+ *
+ * @param orderNo
+ */
+ private void deleteEntrustCloseOrder(String orderNo) {
+ // 若平掉所有张数，若存在委托平仓，则删除委托平仓记录
+ List<ContractEntrustOrderEntity> entrustOrders = contractEntrustOrderDao.selectEntrustOrderByOrderNo(orderNo);
+ if (CollUtil.isNotEmpty(entrustOrders)) {
+ for (ContractEntrustOrderEntity entrustOrder : entrustOrders) {
+ contractEntrustOrderDao.deleteById(entrustOrder.getId());
+ }
+ }
+ }
+
+
/**
* 开多止盈
*/
@@ -164,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) {
// 历史订单
@@ -178,7 +195,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
@@ -224,6 +241,12 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -234,6 +257,7 @@
/**
* 开空止盈
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealForLessStopPro(List<ContractHoldOrderEntity> orderList, List<OrderModel> list) {
//List<CoinsCoinsOrder> orderList = orderMapper.selectOrderByBatchNo(batchno);
//System.out.println("开空止盈订单batchno：" + batchno);
@@ -263,12 +287,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);
@@ -276,7 +296,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -322,6 +342,12 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -334,6 +360,7 @@
*
* @param
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealForMoreLoss(List<ContractHoldOrderEntity> orderList, List<OrderModel> list) {
//List<CoinsCoinsOrder> orderList = orderMapper.selectOrderByBatchNo(batchno);
//System.out.println("开多止损批次号batchno：" + batchno);
@@ -362,12 +389,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) {
// 历史订单
@@ -376,7 +398,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (closePrice
@@ -419,6 +441,12 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -430,6 +458,7 @@
*
* @param
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealForLessLoss(List<ContractHoldOrderEntity> orderList, List<OrderModel> list) {
// List<CoinsCoinsOrder> orderList = orderMapper.selectOrderByBatchNo(batchno);
//System.out.println("开空止损批次号batchno：" + batchno);
@@ -458,12 +487,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) {
// 历史订单
@@ -472,7 +496,7 @@
contractOrderEntity.setId(null);
// 本次平仓数量
- int currentFlat = order.getSymbolCnt();
+ int currentFlat = order.getSymbolCntSale();
BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
// 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -515,6 +539,12 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -593,6 +623,7 @@
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
+ contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -607,11 +638,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));
}
// 扣除手续费
@@ -627,7 +658,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());
@@ -659,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());
@@ -669,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);
@@ -723,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>();
@@ -730,6 +780,11 @@
modelMap.put(model.getOrderId(), model.getOperateNo());
}
for (ContractHoldOrderEntity coinsOrder : orderList) {
+ List<Object> types = redisUtils.lGet(AppContants.RABBIT_TYPE + coinsOrder.getId(), 0, -1);
+ if(types.contains(9) || types.contains(10) || types.contains(11) || types.contains(12)) {
+ log.info("存在止盈/止损 orderId : {}, types : {}", coinsOrder.getId(), JSONObject.toJSONString(types));
+ continue;
+ }
Long orderId = coinsOrder.getId();
Integer operateNo = coinsOrder.getOperateNo();
//判断当前订单是否是最新的爆仓价 不相等时直接进入下一个订单
@@ -748,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();
@@ -809,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();
@@ -826,23 +881,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