From 1498b23be871aec99314da998569a94c9ab53607 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 29 Oct 2020 17:56:37 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 18 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..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
@@ -1,8 +1,11 @@
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.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 +27,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 +75,10 @@
private MemberSettingDao memberSettingDao;
@Resource
private ContractHoldOrderDao contractHoldOrderDao;
+ @Resource
+ private ContractEntrustOrderDao contractEntrustOrderDao;
+ @Resource
+ private RedisUtils redisUtils;
public void dealOrderFromMq(List<OrderModel> list, Integer type) {
@@ -130,6 +134,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());
+ }
+ }
+ }
+
/**
* 开多止盈
@@ -224,6 +245,11 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -234,6 +260,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);
@@ -322,6 +349,11 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -334,6 +366,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);
@@ -419,6 +452,11 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -430,6 +468,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);
@@ -515,6 +554,11 @@
//返佣
ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
+
+ // 全仓模式，止盈/止损 删除委托平仓
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ deleteEntrustCloseOrder(order.getOrderNo());
+ }
}
}
}
@@ -593,6 +637,7 @@
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
+ contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -607,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));
}
// 扣除手续费
@@ -627,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();
@@ -651,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());
@@ -730,6 +790,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();
//判断当前订单是否是最新的爆仓价 不相等时直接进入下一个订单
@@ -828,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