From 83fbe25f0672a1052b1508d7050f44c1383862b1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Sep 2020 16:16:06 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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..362ec92 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;
@@ -108,7 +109,7 @@
}
}
}
- }catch (Exception e) {
+ } catch (Exception e) {
log.error("平仓异常", e);
}
@@ -390,7 +391,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;
}
@@ -471,16 +472,17 @@
@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());
if (CollUtil.isNotEmpty(holdOrderEntities)) {
PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+ // 删除次仓订单
+ contractHoldOrderDao.deleteById(holdOrderEntity.getId());
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
// 单个订单盈利
@@ -502,7 +504,42 @@
}
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);
+
+ // 订单状态转换
+ 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(BigDecimal.ZERO, wallet.getTotalBalance().subtract(totalAmount), null, wallet.getId());
} else {
log.info("无当前持仓");
}
--
Gitblit v1.9.1