From f5708bc8452444408cf3f94b9ed528ca4d58d628 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Sep 2020 11:46:46 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 63 +++++++++++++------------------
1 files changed, 27 insertions(+), 36 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 3c7daff..af809d3 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
@@ -3,6 +3,7 @@
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;
@@ -185,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) {
// 历史订单
@@ -290,12 +286,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);
@@ -395,12 +387,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) {
// 历史订单
@@ -497,12 +484,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) {
// 历史订单
@@ -686,7 +668,7 @@
}
i++;
}
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrder.getSymbol()));
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeEnum.USDT.name());
PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
MemberEntity member = memberService.getById(entrustOrder.getMemberId());
@@ -892,21 +874,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(wallet.getTotalBalance().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
+ 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