From ed69a1c44fa9bce098d412985e8f17163d7def8c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 19:05:14 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 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 7b30a9f..6e1b51f 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
@@ -6,6 +6,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.contract.dao.ContractEntrustOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
@@ -31,6 +32,7 @@
import com.xcong.excoin.modules.member.entity.MemberSettingEntity;
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.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -38,6 +40,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -51,30 +54,22 @@
@Resource
private MemberDao memberDao;
-
@Resource
private OrderWebsocketServiceImpl orderWebsocketService;
-
@Resource
private ContractHoldOrderDao contractHoldOrderDao;
-
@Resource
private ContractOrderDao contractOrderDao;
-
@Resource
private CommonService commonService;
-
@Resource
private MemberWalletContractDao memberWalletContractDao;
-
@Resource
private CacheSettingUtils cacheSettingUtils;
-
@Resource
private RedisUtils redisUtils;
@Resource
private MemberSettingDao memberSettingDao;
-
@Resource
private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
@Resource
@@ -85,19 +80,17 @@
private FollowTraderProfitDetailDao followTraderProfitDetailDao;
@Resource
private FollowFollowerProfitDao followFollowerProfitDao;
+ @Resource
+ private ContractEntrustOrderDao contractEntrustOrderDao;
@Transactional(rollbackFor = Exception.class)
@Override
public void cancelHoldOrder(List<Long> ids) {
- log.info("--------");
if (CollUtil.isNotEmpty(ids)) {
try {
- log.info("=========:{}", ids.size());
if (ids.size() == 1) {
- log.info("------->>>>>>");
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
- log.info(">>>>>>>>>>>>>{}", holdOrderEntity.getPositionType());
// 判断仓位类型是否逐仓
if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
// 逐仓平仓
@@ -259,16 +252,14 @@
* 全仓模式平仓逻辑
*/
public void closingWholeOrder(ContractHoldOrderEntity holdOrderEntity) {
- log.info("进入全仓模式--平仓");
String symbol = holdOrderEntity.getSymbol();
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(symbol));
if (walletContract != null) {
- log.info("--->逻辑");
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
// 盈亏
BigDecimal profitOrLoss = BigDecimal.ZERO;
@@ -309,8 +300,13 @@
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
log.info("bondAmount:{}", bondAmount);
- // 平仓手续费
- BigDecimal fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ // 平仓手续费 TODO 可能需要修复手续费
+ BigDecimal fee = BigDecimal.ZERO;
+ if (holdOrderEntity.getSymbolCnt() != 0) {
+ fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ } else {
+ fee = holdOrderEntity.getOpeningFeeAmount();
+ }
log.info("fee:{}", fee);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setId(null);
@@ -323,16 +319,21 @@
contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
- if (holdOrderEntity.getSymbolCntSale() - closeCnt != 0) {
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
+ if (holdOrderEntity.getSymbolCntSale() != 0) {
+ holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
+ holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
contractHoldOrderDao.updateById(holdOrderEntity);
} else {
contractHoldOrderDao.deleteById(holdOrderEntity.getId());
}
- BigDecimal changeAmount = profitOrLoss.add(bondAmount).subtract(fee);
+ BigDecimal changeAmount = profitOrLoss.add(bondAmount);
+ log.info("changeAmount : {}", changeAmount);
- memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, fee.negate(), null, walletContract.getId());
+ BigDecimal total = profitOrLoss.subtract(fee);
+ log.info("totalMoney : {}", total);
+
+ memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
@@ -340,4 +341,25 @@
}
}
+
+ @Override
+ public void entrustCloseOrder(List<OrderModel> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ List<Long> ids = new ArrayList<>();
+ list.forEach(model -> ids.add(model.getOrderId()));
+ List<ContractEntrustOrderEntity> contractEntrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByIds(ids);
+
+ if (CollUtil.isNotEmpty(contractEntrustOrderEntities)) {
+ for (ContractEntrustOrderEntity entrustOrderEntity : contractEntrustOrderEntities) {
+ closeOrder(entrustOrderEntity);
+ }
+ } else {
+ log.info("平仓委托单未找到");
+ }
+ }
+ }
+
+ private void closeOrder(ContractEntrustOrderEntity entrustOrder) {
+ log.info("执行平仓委托");
+ }
}
--
Gitblit v1.9.1