From afc924b0d88ef320ad09060ae49804556efd8eb6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Sep 2020 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 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 4a100fa..898d1cc 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;
@@ -44,6 +45,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -108,7 +110,7 @@
}
}
}
- }catch (Exception e) {
+ } catch (Exception e) {
log.error("平仓异常", e);
}
@@ -318,8 +320,9 @@
contractOrderEntity.setClosingType(closingType);
contractOrderEntity.setSymbolCnt(closeCnt);
contractOrderEntity.setRewardAmount(profitOrLoss);
- contractOrderEntity.setBondAmount(bondAmount);
+ contractOrderEntity.setBondAmount(bondAmount.add(fee));
contractOrderEntity.setClosingFeeAmount(fee);
+ contractOrderEntity.setClosingTime(new Date());
contractOrderDao.insert(contractOrderEntity);
if (holdOrderEntity.getSymbolCntSale() != 0) {
@@ -390,7 +393,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;
}
@@ -469,15 +472,73 @@
}
+ @Transactional(rollbackFor = Exception.class)
@Override
- public void wholeBombOrder(MemberEntity memberEntity) {
- Long memberId = memberEntity.getId();
- List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null);
+ 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());
- if (CollUtil.isNotEmpty(holdOrderEntities)) {
+ Map<Object, Object> value = redisUtils.hmget(AppContants.WHOLE_BOMB_PREFIX + memberId);
+ if (CollUtil.isNotEmpty(holdOrderEntities)) {
+ 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);
- } else {
- log.info("无当前持仓");
+ 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