From 6107e978c64bc7ca9b3a238444e899932434e21d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 Aug 2020 15:13:33 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 956948d..d697b01 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -17,6 +17,7 @@
import com.xcong.excoin.modules.contract.parameter.dto.SubmitCloseEntrustDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
+import com.xcong.excoin.modules.contract.parameter.dto.WholeCloseOrderDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
@@ -222,12 +223,67 @@
return Result.fail("订单不存在");
}
- if(holdOrderEntity.getSymbolCntSale() - submitCloseEntrustDto.getSymbolCnt() < 0) {
+ if (holdOrderEntity.getSymbolCntSale() - submitCloseEntrustDto.getSymbolCnt() < 0) {
return Result.fail("可平张数不足");
}
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitCloseEntrustDto.getSymbol())));
- return null;
+
+ int closeType;
+ if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ // 开多, 若委托价低于当前价则立即成交
+ if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) <= 0) {
+ WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
+ wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
+ wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
+ return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+ }
+
+ closeType = ContractOrderEntity.ORDER_TYPE_CLOSE_MORE;
+ } else {
+ // 开空, 若委托价高于当前价则立即成交
+ if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) >= 0) {
+ WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
+ wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
+ wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
+ return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+ }
+
+ closeType = ContractOrderEntity.ORDER_TYPE_CLOSE_LESS;
+ }
+
+
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(member.getId(), CoinTypeConvert.convertContractTypeToCoin(holdOrderEntity.getSymbol()));
+
+ BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitCloseEntrustDto.getSymbol());
+ BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, submitCloseEntrustDto.getSymbolCnt(), holdOrderEntity.getLeverRatio());
+
+ ContractEntrustOrderEntity entrustOrder = new ContractEntrustOrderEntity();
+ entrustOrder.setOrderNo(holdOrderEntity.getOrderNo());
+ entrustOrder.setEntrustAmount(bondAmount);
+ entrustOrder.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL);
+ entrustOrder.setMemberId(member.getId());
+ entrustOrder.setEntrustPrice(submitCloseEntrustDto.getEntrustPrice());
+ entrustOrder.setLeverRatio(holdOrderEntity.getLeverRatio());
+ entrustOrder.setSymbolSku(holdOrderEntity.getSymbolSku());
+ entrustOrder.setEntrustType(closeType);
+
+ int i = contractEntrustOrderDao.insert(entrustOrder);
+
+
+ memberWalletContractDao.increaseWalletContractBalanceById(null, null, bondAmount, walletContract.getId());
+
+ if (i > 0) {
+ // 发送委托消息
+ if (holdOrderEntity.getOpeningType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
+ OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+ } else {
+ OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+ }
+ }
+ return Result.ok("委托成功");
}
}
--
Gitblit v1.9.1