From 533ea21b899d31838c15466cb960ca84af6cc68b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 Aug 2020 10:35:21 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 265 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 223 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 309274f..90944d4 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.LoginUserUtils;
+import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.RabbitPriceTypeEnum;
import com.xcong.excoin.common.response.Result;
@@ -22,6 +23,10 @@
import com.xcong.excoin.modules.contract.parameter.dto.*;
import com.xcong.excoin.modules.contract.parameter.vo.*;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
+import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
+import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;
+import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
@@ -83,10 +88,32 @@
@Resource
private MemberDao memberDao;
+ @Resource
+ private FollowTraderInfoDao followTraderInfoDao;
+ @Resource
+ private FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
+
@Transactional(rollbackFor = Exception.class)
@Override
public Result submitOrder(SubmitOrderDto submitOrderDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ log.info("---->{}", memberEntity);
+ log.info("------>{}", memberEntity.getContractPositionType());
+
+ // 判断当前对应的持仓/委托
+ if (memberEntity.getContractPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ List<ContractHoldOrderEntity> holdList = contractHoldOrderDao.selectMemberHoldOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL, memberEntity.getId());
+ List<ContractEntrustOrderEntity> entrustList = contractEntrustOrderDao.selectMemberEntrustOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL, memberEntity.getId());
+ if (CollUtil.isNotEmpty(holdList) || CollUtil.isNotEmpty(entrustList)) {
+ return Result.fail("存在全仓订单,无法下单");
+ }
+ } else {
+ List<ContractHoldOrderEntity> holdList = contractHoldOrderDao.selectMemberHoldOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD, memberEntity.getId());
+ List<ContractEntrustOrderEntity> entrustList = contractEntrustOrderDao.selectMemberEntrustOrderByPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD, memberEntity.getId());
+ if (CollUtil.isNotEmpty(holdList) || CollUtil.isNotEmpty(entrustList)) {
+ return Result.fail("存在逐仓订单,无法下单");
+ }
+ }
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitOrderDto.getSymbol())));
@@ -94,7 +121,7 @@
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
-
+
Long id = memberEntity.getId();
MemberEntity selectById = memberDao.selectById(id);
BigDecimal spread = selectById.getSpread();
@@ -114,10 +141,10 @@
// 市场价*(1 - (点差/10000))
openingPrice = newPrice.multiply(BigDecimal.ONE.subtract(spread.divide(new BigDecimal(10000)))).setScale(8, BigDecimal.ROUND_DOWN);
} else {
- return Result.fail("未知类型");
+ return Result.fail(MessageSourceUtils.getString("unknown_type"));
}
-
log.info("开仓价:{}", openingPrice);
+
// 开仓手续费 建仓价*规格*手数*手续费率
BigDecimal openFeePrice = openingPrice.multiply(lotNumber)
.multiply(new BigDecimal(submitOrderDto.getSymbolCnt()))
@@ -126,9 +153,7 @@
log.info("开仓手续费:{}", openFeePrice);
// 保证金 建仓价*规格*手数*(1/杠杆倍率)
- BigDecimal bondAmount = openingPrice.multiply(lotNumber).multiply(new BigDecimal(submitOrderDto.getSymbolCnt()))
- .multiply(BigDecimal.ONE.divide(new BigDecimal(submitOrderDto.getLeverRatio())))
- .setScale(8, BigDecimal.ROUND_DOWN);
+ BigDecimal bondAmount = CalculateUtil.getBondAmount(openingPrice, lotNumber, submitOrderDto.getSymbolCnt(), submitOrderDto.getLeverRatio());
log.info("保证金:{}", bondAmount);
// 预付款为 --> 保证金+开仓手续费+平仓手续费 (开仓平仓手续费相同)
@@ -136,7 +161,26 @@
log.info("预付款:{}", prePaymentAmount);
if (prePaymentAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
- return Result.fail("可用金额不足");
+ // 可用余额不足
+ return Result.fail(MessageSourceUtils.getString("member_service_0085"));
+ }
+
+ boolean isOpenFollow = false;
+ FollowTraderInfoEntity tradeInfo = null;
+ if (memberEntity.getContractPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ALL) {
+ ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitOrderDto.getOrderType());
+ // 判断当前是否存在全仓订单,若存在则直接合并,若不存在则创建订单
+ if (wholeHoldOrder != null) {
+ return mergeWholeHoldOrder(openingPrice, openFeePrice, newPrice, submitOrderDto, wholeHoldOrder, memberEntity);
+ }
+ } else {
+ // 仅在逐仓模式中启用带单,判断是否开启了带单
+ if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ tradeInfo = followTraderInfoDao.selectTraderInfoByMemberId(memberEntity.getId());
+ if (tradeInfo.getIsOpen().equals(FollowTraderInfoEntity.ISOPEN_Y)) {
+ isOpenFollow = true;
+ }
+ }
}
// 预估强平价
@@ -146,10 +190,11 @@
ContractHoldOrderEntity holdOrderEntity = new ContractHoldOrderEntity();
holdOrderEntity.setMemberId(memberEntity.getId());
holdOrderEntity.setOrderNo(commonService.generateOrderNo(memberEntity.getId()));
- holdOrderEntity.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ADD);
+ holdOrderEntity.setPositionType(memberEntity.getContractPositionType());
holdOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_MARK);
holdOrderEntity.setSymbol(submitOrderDto.getSymbol());
holdOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt());
+ holdOrderEntity.setSymbolCntSale(submitOrderDto.getSymbolCnt());
holdOrderEntity.setSymbolSku(lotNumber);
holdOrderEntity.setLeverRatio(submitOrderDto.getLeverRatio());
holdOrderEntity.setForceClosingPrice(forceClosingPrice);
@@ -160,18 +205,85 @@
holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
holdOrderEntity.setPrePaymentAmount(prePaymentAmount);
holdOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
+ holdOrderEntity.setOperateNo(1);
+ // 设置合约类型
+ holdOrderEntity.setContractType(isOpenFollow ? ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY : ContractOrderEntity.CONTRACTTYPE_NORMAL);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setOpeningTime(new Date());
contractHoldOrderDao.insert(holdOrderEntity);
int i = contractOrderDao.insert(contractOrderEntity);
+
if (i > 0) {
memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
+
+ // 发送爆仓消息
+ sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
+
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
- return Result.ok("提交成功");
+
+ // 插入财务流水
+ if (submitOrderDto.getOrderType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买涨持仓", "买涨:" + submitOrderDto.getSymbol());
+ } else {
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
+ }
+
+ // 若该用户为交易员且开启带单模式,则发送带单异步
+ if (isOpenFollow) {
+ FollowFollowerOrderRelationEntity relationEntity = new FollowFollowerOrderRelationEntity();
+ relationEntity.setIsShow(FollowFollowerOrderRelationEntity.IS_SHOW_Y);
+ relationEntity.setMemberId(holdOrderEntity.getMemberId());
+ relationEntity.setOrderId(holdOrderEntity.getId());
+ relationEntity.setOrderType(FollowFollowerOrderRelationEntity.ORDER_TYPE_HOLD);
+ relationEntity.setTradeId(tradeInfo.getId());
+ relationEntity.setTradeMemberId(tradeInfo.getMemberId());
+ relationEntity.setTradeOrderNo(holdOrderEntity.getOrderNo());
+ followFollowerOrderRelationDao.insert(relationEntity);
+
+ ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
+ }
+ // 提交成功
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
- return Result.fail("提交失败");
+ // 提交失败
+ return Result.fail(MessageSourceUtils.getString("member_service_0067"));
+ }
+
+ /**
+ * 全仓模式--若当前已经存在持仓,则合并当前持仓
+ */
+ public Result mergeWholeHoldOrder(BigDecimal openPrice, BigDecimal openFeePrice, BigDecimal newPrice, SubmitOrderDto submitOrderDto, ContractHoldOrderEntity holdOrderEntity, MemberEntity memberEntity) {
+ BigDecimal totalPrice = openPrice.multiply(BigDecimal.valueOf(submitOrderDto.getSymbolCnt()));
+ // (当前开仓价*张数 + 原开仓价 * 原可平张数) / (张数 + 原可平张数)
+ BigDecimal newOpenPrice = totalPrice.add(holdOrderEntity.getOpeningPrice().multiply(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()))).divide(BigDecimal.valueOf(submitOrderDto.getSymbolCnt() + holdOrderEntity.getSymbolCntSale()), 8, BigDecimal.ROUND_DOWN);
+ // 规格
+ BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitOrderDto.getSymbol());
+ // 保证金
+ BigDecimal bondAmount = CalculateUtil.getBondAmount(newOpenPrice, lotNumber, submitOrderDto.getSymbolCnt(), submitOrderDto.getLeverRatio());
+ // 预估强平价
+ BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(bondAmount, newOpenPrice, submitOrderDto.getSymbolCnt(), lotNumber, submitOrderDto.getOrderType(), memberEntity);
+
+ ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
+ contractOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
+ contractOrderEntity.setForceClosingPrice(forceSetPrice);
+ contractOrderEntity.setOpeningPrice(openPrice);
+ contractOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt());
+ contractOrderEntity.setOpeningTime(new Date());
+ contractOrderEntity.setMarkPrice(newPrice);
+
+ contractOrderDao.insert(contractOrderEntity);
+
+ holdOrderEntity.setSymbolCntSale(submitOrderDto.getSymbolCnt() + holdOrderEntity.getSymbolCntSale());
+ holdOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt() + holdOrderEntity.getSymbolCnt());
+ holdOrderEntity.setForceClosingPrice(forceSetPrice);
+ holdOrderEntity.setBondAmount(bondAmount);
+ holdOrderEntity.setOpeningPrice(newOpenPrice);
+ holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().add(openFeePrice));
+
+ contractHoldOrderDao.updateById(holdOrderEntity);
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@Override
@@ -190,10 +302,10 @@
}
@Override
- public Result findHoldOrderList(String symbol) {
+ public Result findHoldOrderList(String symbol, int type) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
- List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol);
+ List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, type);
MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
if (CollUtil.isNotEmpty(list)) {
BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
@@ -220,7 +332,7 @@
if (rewardRatio.compareTo(BigDecimal.ZERO) > -1) {
rewardRatio = rewardRatio.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getProfitParam()));
} else {
- rewardRatio = rewardRatio.multiply(BigDecimal.ONE.add(tradeSettingEntity.getProfitParam()));
+// rewardRatio = rewardRatio.multiply(BigDecimal.ONE.add(tradeSettingEntity.getProfitParam()));
}
}
@@ -253,7 +365,7 @@
Map<String, Object> result = new HashMap<>();
result.put("hold", resultList);
- result.put("totalProfitOrLoss", totalProfitOrLoss);
+ result.put("totalProfitOrLoss", totalProfitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString());
return Result.ok(result);
}
return Result.ok("success");
@@ -264,11 +376,13 @@
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(memberEntity.getId(), id);
if (holdOrderEntity == null) {
- return Result.fail("订单不存在");
+ // 订单不存在
+ return Result.fail(MessageSourceUtils.getString("order_service_0027"));
}
if (ContractHoldOrderEntity.ORDER_CAN_CLOSING_N == holdOrderEntity.getIsCanClosing()) {
- return Result.fail("订单暂不可平仓");
+ // 该订单暂不能平仓
+ return Result.fail(MessageSourceUtils.getString("order_service_0045"));
}
contractHoldOrderDao.updateHoldOrderIsCanClosingById(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N, id);
@@ -277,13 +391,53 @@
ids.add(id);
producer.sendCloseTrade(JSONObject.toJSONString(ids));
- return Result.ok("平仓成功");
+ // 平仓成功
+ return Result.ok(MessageSourceUtils.getString("order_service_0044"));
+ }
+
+ @Override
+ public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto) {
+ MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(memberEntity.getId(), wholeCloseOrderDto.getId());
+ if (holdOrderEntity == null) {
+ // 订单不存在
+ return Result.fail(MessageSourceUtils.getString("order_service_0027"));
+ }
+
+ if (ContractHoldOrderEntity.ORDER_CAN_CLOSING_N == holdOrderEntity.getIsCanClosing()) {
+ // 该订单暂不能平仓
+ return Result.fail(MessageSourceUtils.getString("order_service_0045"));
+ }
+
+ if (wholeCloseOrderDto.getCount() > holdOrderEntity.getSymbolCntSale()) {
+ return Result.fail("可平张数不足");
+ }
+
+ // 判断当前持仓张数是否等于平仓张数,若等于则直接更新该订单为不可平状态,否则更新可平张数
+ if (wholeCloseOrderDto.getCount() == holdOrderEntity.getSymbolCntSale()) {
+ contractHoldOrderDao.updateHoldOrderIsCanClosingById(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N, wholeCloseOrderDto.getId());
+ } else {
+ // 更新可平张数
+ holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - wholeCloseOrderDto.getCount());
+ contractHoldOrderDao.updateById(holdOrderEntity);
+ }
+
+ // 将待平张数放入缓存
+ redisUtils.set(AppContants.CLOSING_ORDER_PREFIX + holdOrderEntity.getId(), wholeCloseOrderDto.getCount());
+
+ // 发送平仓消息
+ List<Long> ids = new ArrayList<>();
+ ids.add(wholeCloseOrderDto.getId());
+ producer.sendCloseTrade(JSONObject.toJSONString(ids));
+
+ // 平仓成功
+ return Result.ok(MessageSourceUtils.getString("order_service_0044"));
}
@Override
public Result cancelHoldOrderBatch(SymbolDto symbolDto) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
- List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol());
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbolDto.getSymbol(), 1);
if (CollUtil.isEmpty(holdOrderEntities)) {
return Result.fail("订单不存在");
}
@@ -377,22 +531,25 @@
// 开多止盈
if (stopProfitPrice != null) {
model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_MORE_STOP_PROFIT.getValue(), stopProfitPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 开多止损
if (stopLessPrice != null) {
model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_MORE_STOP_LESS.getValue(), stopLessPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
}
} else {
// 开空止盈
if (stopProfitPrice != null) {
model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_LESS_STOP_PROFIT.getValue(), stopProfitPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 开空止损
if (stopLessPrice != null) {
model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_LESS_STOP_LESS.getValue(), stopLessPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
}
}
- producer.sendPriceOperate(JSONObject.toJSONString(model));
return Result.ok("设置成功");
}
return Result.fail("设置失败");
@@ -414,14 +571,14 @@
if (changeBondDto.getAmount().compareTo(walletContract.getAvailableBalance()) > 0) {
return Result.fail("可用余额不足");
}
- memberWalletContractDao.increaseWalletContractBalanceById(changeBondDto.getAmount().negate(), null, changeBondDto.getAmount(), walletContract.getId());
+ memberWalletContractDao.increaseWalletContractBalanceById(changeBondDto.getAmount().negate(), null, null, walletContract.getId());
holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().add(changeBondDto.getAmount()));
// 减少保证金
} else {
if (holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getPrePaymentAmount()).subtract(changeBondDto.getAmount()).compareTo(BigDecimal.ZERO) < 0) {
return Result.fail("超出保证金最大减少金额");
}
- memberWalletContractDao.increaseWalletContractBalanceById(changeBondDto.getAmount(), null, changeBondDto.getAmount().negate(), walletContract.getId());
+ memberWalletContractDao.increaseWalletContractBalanceById(changeBondDto.getAmount(), null, null, walletContract.getId());
holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(changeBondDto.getAmount()));
}
@@ -432,15 +589,8 @@
int i = contractHoldOrderDao.updateById(holdOrderEntity);
if (i > 0) {
- OrderModel model = null;
- // 开多
- if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
- model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
- // 开空
- } else {
- model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
- }
- producer.sendPriceOperate(JSONObject.toJSONString(model));
+ // 发送爆仓消息
+ sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
return Result.ok("调整成功");
}
return Result.fail("调整失败");
@@ -543,7 +693,8 @@
HoldOrderDetailVo holdOrderDetailVo = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrderDetailVo(holdOrderEntity);
BigDecimal feeSpread = cacheSettingUtils.getTradeSetting().getFeeSpreadRatio();
- holdOrderDetailVo.setOpeningFeeAmount(holdOrderDetailVo.getOpeningFeeAmount().multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN));
+// holdOrderDetailVo.setOpeningFeeAmount(holdOrderDetailVo.getOpeningFeeAmount().multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN));
+ holdOrderDetailVo.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount(), feeSpread);
return Result.ok(holdOrderDetailVo);
}
@@ -569,8 +720,10 @@
OrderDetailVo orderDetailVo = ContractOrderEntityMapper.INSTANCE.entityToDetailVo(contractOrderEntity);
BigDecimal feeSpread = cacheSettingUtils.getTradeSetting().getFeeSpreadRatio();
- orderDetailVo.setClosingFeeAmount(orderDetailVo.getClosingFeeAmount() == null ? orderDetailVo.getClosingFeeAmount() : orderDetailVo.getClosingFeeAmount().multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN));
- orderDetailVo.setOpeningFeeAmount(orderDetailVo.getOpeningFeeAmount().multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN));
+// orderDetailVo.setClosingFeeAmount(orderDetailVo.getClosingFeeAmount() == null ? orderDetailVo.getClosingFeeAmount() : orderDetailVo.getClosingFeeAmount().multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN));
+// orderDetailVo.setOpeningFeeAmount(orderDetailVo.getOpeningFeeAmount() == null ? orderDetailVo.getOpeningFeeAmount() : orderDetailVo.getOpeningFeeAmount().multiply(feeSpread).setScale(8, BigDecimal.ROUND_DOWN));
+ orderDetailVo.setOpeningFeeAmount(contractOrderEntity.getOpeningFeeAmount(), feeSpread);
+ orderDetailVo.setClosingFeeAmount(contractOrderEntity.getClosingFeeAmount(), feeSpread);
return Result.ok(orderDetailVo);
}
@@ -613,17 +766,45 @@
holdOrderEntity.setOperateNo(holdOrderEntity.getOperateNo() + 1);
contractHoldOrderDao.updateById(holdOrderEntity);
- OrderModel model = null;
- // 开多
- if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
- model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), newForcePrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
- // 开空
- } else {
- model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), newForcePrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
- }
- producer.sendPriceOperate(JSONObject.toJSONString(model));
+ // 发送爆仓消息
+ sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), newForcePrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
}
}
}
}
+
+ public void sendOrderBombMsg(Long id, int type, BigDecimal forceClosingPrice, String symbol, int operateNo) {
+ OrderModel model = null;
+ // 开多
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == type) {
+ model = new OrderModel(id, RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), symbol, operateNo);
+ // 开空
+ } else {
+ model = new OrderModel(id, RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), symbol, operateNo);
+ }
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+ }
+
+ @Override
+ public Result changePositionType() {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+
+ List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberId(member.getId());
+ List<ContractEntrustOrderEntity> entrustList = contractEntrustOrderDao.selectEntrustOrderListByMemberId(member.getId());
+
+ if (CollUtil.isNotEmpty(list) || CollUtil.isNotEmpty(entrustList)) {
+ return Result.fail("存在持仓/委托, 无法更改");
+ }
+
+ Integer positionType = member.getContractPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD ? ContractEntrustOrderEntity.POSITION_TYPE_ALL : ContractEntrustOrderEntity.POSITION_TYPE_ADD;
+ MemberEntity updateEntity = new MemberEntity();
+ updateEntity.setContractPositionType(positionType);
+ updateEntity.setId(member.getId());
+ int i = memberDao.updateById(updateEntity);
+ if (i > 0) {
+ LoginUserUtils.resetAppLoginUser(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0040"));
+ }
+ return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+ }
}
--
Gitblit v1.9.1