From d23645e976981bc9b670eea1d469fe8a36be309c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 17 Apr 2024 17:19:53 +0800
Subject: [PATCH] 55测试环境
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 276 +++++++++++++++++++++++++------------------------------
1 files changed, 125 insertions(+), 151 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 700e271..7236a9b 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.contract.service.impl;
+import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.LoginUserUtils;
@@ -23,6 +24,7 @@
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;
+import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
@@ -61,6 +63,9 @@
@Resource
private ContractOrderDao contractOrderDao;
+
+ @Resource
+ private MemberDao memberDao;
@Resource
private CommonService commonService;
@@ -78,6 +83,13 @@
@Override
public Result addContractEntrustOrder(SubmitEntrustDto submitEntrustDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ //查询是否可以点击平仓按钮
+ Long memberIdLong = memberEntity.getId();
+ MemberEntity selectById = memberDao.selectById(memberIdLong);
+ Integer pcState = selectById.getPcState();
+ if(MemberEntity.PCSTATE_N == pcState) {
+ return Result.loading("loading_type");
+ }
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitEntrustDto.getSymbol())));
@@ -108,128 +120,59 @@
}
}
- // 逐仓委托
- if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == memberEntity.getContractPositionType()) {
- return entrustForAdd(submitEntrustDto, memberEntity);
- // 全仓委托
+ BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitEntrustDto.getSymbol());
+ PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
+
+ // 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
+ BigDecimal bondAmount = CalculateUtil.getBondAmount(submitEntrustDto.getEntrustPrice(), lotNumber, submitEntrustDto.getSymbolCnt(), submitEntrustDto.getLeverRatio());
+
+ // 开仓手续费 建仓价*规格*手数*手续费率
+ BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(submitEntrustDto.getEntrustPrice(), lotNumber, submitEntrustDto.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
+ log.info("手续费:{}", openFeePrice);
+
+ // 预付款
+ BigDecimal entrustTotalAmount = bondAmount.add(openFeePrice).add(openFeePrice);
+ log.info("预付款:{}", entrustTotalAmount);
+
+ if (entrustTotalAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
+ throw new GlobalException(MessageSourceUtils.getString("member_service_0085"));
+ }
+
+ ContractEntrustOrderEntityMapper convert = ContractEntrustOrderEntityMapper.INSTANCE;
+ ContractEntrustOrderEntity entrustOrderEntity = convert.submitEntrustDtoToEntity(submitEntrustDto);
+ entrustOrderEntity.setOrderNo(commonService.generateOrderNo(memberEntity.getId()));
+ entrustOrderEntity.setMemberId(memberEntity.getId());
+ entrustOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
+ entrustOrderEntity.setSymbolSku(lotNumber);
+ entrustOrderEntity.setEntrustAmount(entrustTotalAmount);
+ entrustOrderEntity.setPositionType(memberEntity.getContractPositionType());
+
+ int i = contractEntrustOrderDao.insert(entrustOrderEntity);
+ memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
+ if (i > 0) {
+
+ // 发送委托单队列消息
+ if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
+ OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol(), entrustOrderEntity.getMemberId());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买涨", "买涨:" + submitEntrustDto.getSymbol());
+ } else {
+ OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol(), entrustOrderEntity.getMemberId());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买跌", "买跌:" + submitEntrustDto.getSymbol());
+ }
+
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"));
} else {
- return entrustForWhole(submitEntrustDto, memberEntity);
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
}
return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
- }
-
- private Result entrustForAdd(SubmitEntrustDto submitEntrustDto, MemberEntity memberEntity) {
- BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitEntrustDto.getSymbol());
- PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
-
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
-
- // 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
- BigDecimal bondAmount = CalculateUtil.getBondAmount(submitEntrustDto.getEntrustPrice(), lotNumber, submitEntrustDto.getSymbolCnt(), submitEntrustDto.getLeverRatio());
-
- // 开仓手续费 建仓价*规格*手数*手续费率
- BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(submitEntrustDto.getEntrustPrice(), lotNumber, submitEntrustDto.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
- log.info("手续费:{}", openFeePrice);
-
- // 预付款
- BigDecimal entrustTotalAmount = bondAmount.add(openFeePrice).add(openFeePrice);
- log.info("预付款:{}", entrustTotalAmount);
-
- if (entrustTotalAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
- throw new GlobalException(MessageSourceUtils.getString("member_service_0085"));
- }
-
- ContractEntrustOrderEntityMapper convert = ContractEntrustOrderEntityMapper.INSTANCE;
- ContractEntrustOrderEntity entrustOrderEntity = convert.submitEntrustDtoToEntity(submitEntrustDto);
- entrustOrderEntity.setOrderNo(commonService.generateOrderNo(memberEntity.getId()));
- entrustOrderEntity.setMemberId(memberEntity.getId());
- entrustOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
- entrustOrderEntity.setSymbolSku(lotNumber);
- entrustOrderEntity.setEntrustAmount(entrustTotalAmount);
- entrustOrderEntity.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD);
-
- int i = contractEntrustOrderDao.insert(entrustOrderEntity);
- memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
- if (i > 0) {
-
- // 发送委托单队列消息
- if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
- OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
- producer.sendPriceOperate(JSONObject.toJSONString(model));
-
- LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买涨", "买涨:" + submitEntrustDto.getSymbol());
- } else {
- OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
- producer.sendPriceOperate(JSONObject.toJSONString(model));
-
- LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买跌", "买跌:" + submitEntrustDto.getSymbol());
- }
-
- return Result.ok(MessageSourceUtils.getString("result_success_msg"));
- } else {
- return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
- }
- }
-
- private Result entrustForWhole(SubmitEntrustDto submitEntrustDto, MemberEntity memberEntity) {
- BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitEntrustDto.getSymbol());
- PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
-
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(submitEntrustDto.getSymbol()));
-
- ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitEntrustDto.getEntrustType());
-
- BigDecimal bondAmount;
- BigDecimal openFeePrice;
- BigDecimal entrustTotalAmount;
-
- // 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
- bondAmount = CalculateUtil.getBondAmount(submitEntrustDto.getEntrustPrice(), lotNumber, submitEntrustDto.getSymbolCnt(), submitEntrustDto.getLeverRatio());
-
- // 开仓手续费 建仓价*规格*手数*手续费率
- openFeePrice = CalculateUtil.getOpenFeePrice(submitEntrustDto.getEntrustPrice(), lotNumber, submitEntrustDto.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
- log.info("手续费:{}", openFeePrice);
-
- // 预付款
- entrustTotalAmount = bondAmount.add(openFeePrice).add(openFeePrice);
- log.info("预付款:{}", entrustTotalAmount);
-
- if (entrustTotalAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
- throw new GlobalException(MessageSourceUtils.getString("member_service_0085"));
- }
-
- ContractEntrustOrderEntityMapper convert = ContractEntrustOrderEntityMapper.INSTANCE;
- ContractEntrustOrderEntity entrustOrderEntity = convert.submitEntrustDtoToEntity(submitEntrustDto);
- entrustOrderEntity.setOrderNo(commonService.generateOrderNo(memberEntity.getId()));
- entrustOrderEntity.setMemberId(memberEntity.getId());
- entrustOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
- entrustOrderEntity.setSymbolSku(lotNumber);
- entrustOrderEntity.setEntrustAmount(entrustTotalAmount);
- entrustOrderEntity.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL);
-
- int i = contractEntrustOrderDao.insert(entrustOrderEntity);
- memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
- if (i > 0) {
-
- // 发送委托单队列消息
- if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
- OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
- producer.sendPriceOperate(JSONObject.toJSONString(model));
-
- LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买涨", "买涨:" + submitEntrustDto.getSymbol());
- } else {
- OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
- producer.sendPriceOperate(JSONObject.toJSONString(model));
-
- LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买跌", "买跌:" + submitEntrustDto.getSymbol());
- }
-
- return Result.ok(MessageSourceUtils.getString("result_success_msg"));
- } else {
- return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
- }
}
@Override
@@ -244,33 +187,47 @@
@Transactional(rollbackFor = Exception.class)
public Result cancelEntrustOrder(Long id) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ //查询是否可以点击平仓按钮
+ Long memberIdLong = memberEntity.getId();
+ MemberEntity selectById = memberDao.selectById(memberIdLong);
+ Integer pcState = selectById.getPcState();
+ if(MemberEntity.PCSTATE_N == pcState) {
+ return Result.loading("loading_type");
+ }
// 查询该委托单是否为该用户所有
ContractEntrustOrderEntity entrustOrderEntity = contractEntrustOrderDao.selectEntrustOrderByIdAndMemberId(id, memberEntity.getId());
if (entrustOrderEntity == null) {
return Result.fail(MessageSourceUtils.getString("entrust_order_not_exist"));
}
-
- MemberWalletContractEntity walletContractEntity;
- if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == entrustOrderEntity.getPositionType()) {
- walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
- } else {
- walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrderEntity.getSymbol()));
- }
-
- BigDecimal total = entrustOrderEntity.getEntrustAmount();
- memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
-
ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
orderEntity.setOrderStatus(ContractOrderEntity.ORDER_STATUS_CANCEL);
+
+ if (entrustOrderEntity.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE) {
+ orderEntity.setClosingType(RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue());
+ }
+
+ if (entrustOrderEntity.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_LESS) {
+ orderEntity.setClosingType(RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue());
+ }
+
int i = contractOrderDao.insert(orderEntity);
contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());
- // 插入财务流水
- LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
if (i > 0) {
+ MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
+ BigDecimal total = entrustOrderEntity.getEntrustAmount();
+ if (entrustOrderEntity.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE || entrustOrderEntity.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_LESS) {
+ memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
+
+ // 插入财务流水
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
+ }
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == entrustOrderEntity.getPositionType()) {
+ ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrderEntity.getSymbol(), memberEntity);
+ }
return Result.ok(MessageSourceUtils.getString("cancellation_success"));
}
return Result.fail(MessageSourceUtils.getString("cancellation_fail"));
@@ -284,6 +241,13 @@
@Override
public Result addCloseContractEntrustOrder(SubmitCloseEntrustDto submitCloseEntrustDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
+ //查询是否可以点击平仓按钮
+ Long memberIdLong = member.getId();
+ MemberEntity selectById = memberDao.selectById(memberIdLong);
+ Integer pcState = selectById.getPcState();
+ if(MemberEntity.PCSTATE_N == pcState) {
+ return Result.loading("loading_type");
+ }
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(member.getId(), submitCloseEntrustDto.getId());
if (holdOrderEntity == null) {
return Result.fail("订单不存在");
@@ -293,34 +257,45 @@
return Result.fail("可平张数不足");
}
+ List<ContractEntrustOrderEntity> entrustOrders = contractEntrustOrderDao.selectEntrustOrderByOrderNo(holdOrderEntity.getOrderNo());
+ if (CollUtil.isNotEmpty(entrustOrders)) {
+ int entrustCnt = 0;
+ for (ContractEntrustOrderEntity entrustOrder : entrustOrders) {
+ entrustCnt += entrustOrder.getSymbolCnt();
+ }
+
+
+ if (submitCloseEntrustDto.getSymbolCnt() > holdOrderEntity.getSymbolCntSale() - entrustCnt) {
+ return Result.fail("当前存在多个委托，无法提交该数量委托");
+ }
+ }
+
+
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
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);
-// }
+ 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);
-// }
+ 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(holdOrderEntity.getSymbol());
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, submitCloseEntrustDto.getSymbolCnt(), holdOrderEntity.getLeverRatio());
@@ -328,26 +303,25 @@
ContractEntrustOrderEntity entrustOrder = new ContractEntrustOrderEntity();
entrustOrder.setOrderNo(holdOrderEntity.getOrderNo());
entrustOrder.setEntrustAmount(bondAmount);
+ entrustOrder.setBondAmount(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);
- entrustOrder.setSymbolCnt(holdOrderEntity.getSymbolCnt());
+ entrustOrder.setSymbolCnt(submitCloseEntrustDto.getSymbolCnt());
+ entrustOrder.setSymbol(holdOrderEntity.getSymbol());
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_CLOSE_MORE.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ OrderModel model = new OrderModel(entrustOrder.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_MORE.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol(), holdOrderEntity.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
} else {
- OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_LESS.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ OrderModel model = new OrderModel(entrustOrder.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_LESS.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol(), holdOrderEntity.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
}
--
Gitblit v1.9.1