From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index e593d0b..c316708 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -7,6 +7,7 @@
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.OrderClosingTypeEnum;
import com.xcong.excoin.common.system.service.CommonService;
+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.dao.ContractOrderDao;
@@ -34,6 +35,8 @@
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
+import com.xcong.excoin.rabbit.pricequeue.whole.HoldOrderDataModel;
+import com.xcong.excoin.rabbit.pricequeue.whole.WholePriceDataModel;
import com.xcong.excoin.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -44,6 +47,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -108,7 +112,7 @@
}
}
}
- }catch (Exception e) {
+ } catch (Exception e) {
log.error("平仓异常", e);
}
@@ -320,6 +324,7 @@
contractOrderEntity.setRewardAmount(profitOrLoss);
contractOrderEntity.setBondAmount(bondAmount.add(fee));
contractOrderEntity.setClosingFeeAmount(fee);
+ contractOrderEntity.setClosingTime(new Date());
contractOrderDao.insert(contractOrderEntity);
if (holdOrderEntity.getSymbolCntSale() != 0) {
@@ -347,6 +352,8 @@
log.info("totalMoney : {}", total);
memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
+
+ ThreadPoolUtils.sendWholePrice(memberEntity.getId());
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
@@ -390,7 +397,7 @@
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberId, orderType, symbol);
List<Object> types = redisUtils.lGet(AppContants.RABBIT_TYPE + holdOrderEntity.getId(), 0, -1);
- if(types.contains(9) || types.contains(10) || types.contains(11) || types.contains(12)) {
+ if (types.contains(9) || types.contains(10) || types.contains(11) || types.contains(12)) {
log.info("存在止盈/止损 orderId : {}, types : {}", holdOrderEntity.getId(), JSONObject.toJSONString(types));
return;
}
@@ -463,46 +470,130 @@
memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
contractEntrustOrderDao.deleteById(entrustOrder.getId());
+
+ ThreadPoolUtils.sendWholePrice(memberEntity.getId());
+
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void wholeBombOrder(WholePriceDataModel wholePriceData) {
+ MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(wholePriceData.getMemberId(), CoinTypeEnum.USDT.name());
+ List<HoldOrderDataModel> list = wholePriceData.getList();
+ if (CollUtil.isNotEmpty(list)) {
+ for (HoldOrderDataModel holdOrderDataModel : list) {
+ ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
+ if (holdOrderEntity == null) {
+ continue;
+ }
+
+ contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
+
+ ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
+
+ if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ contractOrderEntity.setClosingType(4);
+ } else {
+ contractOrderEntity.setClosingType(5);
+ }
+
+ BigDecimal rewardRatio = holdOrderDataModel.getRewardAmount().divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
+ contractOrderEntity.setRewardRatio(rewardRatio);
+ contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().negate()));
+ contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
+// contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
+
+ // 订单状态转换
+ if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
+ } else {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
+ }
+ contractOrderEntity.setClosingTime(new Date());
+
+ contractOrderDao.insert(contractOrderEntity);
+ }
+
+ List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(wholePriceData.getMemberId());
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ if (CollUtil.isNotEmpty(entrustOrder)) {
+ for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
+ totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+ }
+ }
+
+ memberWalletContractDao.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalAmount).negate(), null, wallet.getId());
+ }
+ }
+
+ @Transactional(rollbackFor = Exception.class)
@Override
public void wholeBombOrder(List<OrderModel> list) {
-
for (OrderModel orderModel : list) {
MemberEntity memberEntity = memberDao.selectById(orderModel.getMemberId());
Long memberId = memberEntity.getId();
List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null);
+ MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
- BigDecimal currentPrice = new BigDecimal(orderModel.getPrice());
+ Map<Object, Object> value = redisUtils.hmget(AppContants.WHOLE_BOMB_PREFIX + memberId);
if (CollUtil.isNotEmpty(holdOrderEntities)) {
- PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
+ BigDecimal maxLess = BigDecimal.ZERO;
+ ContractOrderEntity maxLessEntity = null;
+ BigDecimal totalProfitOrLess = BigDecimal.ZERO;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+ // 删除次仓订单
+ contractHoldOrderDao.deleteById(holdOrderEntity.getId());
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
+ String symbolPrice = (String) value.get(holdOrderEntity.getSymbol());
+ log.info("symbolPrice : {}, symbol : {}", symbolPrice, holdOrderEntity.getSymbol());
+ BigDecimal currentPrice = new BigDecimal(symbolPrice);
- // 单个订单盈利
- BigDecimal profitOrLess = BigDecimal.ZERO;
- // 开多
- if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
- profitOrLess = currentPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(new BigDecimal(holdOrderEntity.getSymbolCnt())).multiply(lotNumber);
- // 开空
- } else {
- profitOrLess = holdOrderEntity.getOpeningPrice().subtract(currentPrice).multiply(new BigDecimal(holdOrderEntity.getSymbolCnt())).multiply(lotNumber);
- }
-
- if (MemberEntity.IS_PROFIT_Y == memberEntity.getIsProfit()) {
- if (profitOrLess.compareTo(BigDecimal.ZERO) > 0) {
- profitOrLess = profitOrLess.multiply(BigDecimal.ONE.subtract(tradeSetting.getForceParam()));
- } else {
- profitOrLess = profitOrLess.multiply(BigDecimal.ONE.add(tradeSetting.getForceParam()));
- }
- }
-
+ BigDecimal profitOrLess = CalculateUtil.calOrderProfitOrLess(holdOrderEntity.getOpeningType(), currentPrice, holdOrderEntity.getOpeningPrice(), lotNumber, holdOrderEntity.getSymbolCntSale(), memberEntity.getIsProfit());
+ log.info("profitOrLess ---> {}", profitOrLess);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
+
+ // 查询是否满足爆仓条件
+ if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ contractOrderEntity.setClosingType(4);
+ } else {
+ contractOrderEntity.setClosingType(5);
+ }
+
+ // 盈亏比例(回报率)
+ BigDecimal rewardRatio = profitOrLess.divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
+ contractOrderEntity.setId(null);
+ contractOrderEntity.setRewardRatio(rewardRatio);
+ contractOrderEntity.setRewardAmount(profitOrLess);
+ contractOrderEntity.setClosingPrice(currentPrice);
+ contractOrderEntity.setForceClosingPrice(currentPrice);
+
+ // 订单状态转换
+ if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
+ } else {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
+ }
+ contractOrderEntity.setClosingTime(new Date());
+ contractOrderEntity.setClosingFeeAmount(holdOrderEntity.getOpeningFeeAmount());
+
+ contractOrderDao.insert(contractOrderEntity);
}
+
+ List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberId);
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ if (CollUtil.isNotEmpty(entrustOrder)) {
+ for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
+ totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+ }
+ }
+
+ memberWalletContractDao.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalAmount).negate(), null, wallet.getId());
+
+ redisUtils.del(AppContants.WHOLE_BOMB_PREFIX + memberId);
} else {
log.info("无当前持仓");
}
--
Gitblit v1.9.1