From ddb79e7126625aa7e97d1a8d9a1a0dcde7dfff0a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 Aug 2020 11:25:33 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 142 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 119 insertions(+), 23 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 0cc3d15..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
@@ -8,22 +8,26 @@
import com.xcong.excoin.common.response.Result;
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;
+import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.mapper.ContractEntrustOrderEntityMapper;
+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;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
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.rabbit.producer.OrderProducer;
-import com.xcong.excoin.utils.CacheSettingUtils;
-import com.xcong.excoin.utils.CoinTypeConvert;
-import com.xcong.excoin.utils.RedisUtils;
+import com.xcong.excoin.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +66,12 @@
@Resource
private OrderProducer producer;
+ @Resource
+ private ContractHoldOrderDao contractHoldOrderDao;
+
+ @Resource
+ private ContractHoldOrderService contractHoldOrderService;
+
@Transactional(rollbackFor = Exception.class)
@Override
public Result addContractEntrustOrder(SubmitEntrustDto submitEntrustDto) {
@@ -75,14 +85,24 @@
// 开多委托价不能大于当前价
if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
if (submitEntrustDto.getEntrustPrice().compareTo(newPrice) > -1) {
- return Result.fail("委托价不能大于当前价");
+ SubmitOrderDto submitOrderDto = new SubmitOrderDto();
+ submitOrderDto.setOrderType(submitEntrustDto.getEntrustType());
+ submitOrderDto.setSymbol(submitEntrustDto.getSymbol());
+ submitOrderDto.setSymbolCnt(submitEntrustDto.getSymbolCnt());
+ submitOrderDto.setLeverRatio(submitEntrustDto.getLeverRatio());
+ return contractHoldOrderService.submitOrder(submitOrderDto);
}
}
// 开空委托价不能小于当前价
if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_LESS) {
if (submitEntrustDto.getEntrustPrice().compareTo(newPrice) < 1) {
- return Result.fail("委托价不能小于当前价");
+ SubmitOrderDto submitOrderDto = new SubmitOrderDto();
+ submitOrderDto.setOrderType(submitEntrustDto.getEntrustType());
+ submitOrderDto.setSymbol(submitEntrustDto.getSymbol());
+ submitOrderDto.setSymbolCnt(submitEntrustDto.getSymbolCnt());
+ submitOrderDto.setLeverRatio(submitEntrustDto.getLeverRatio());
+ return contractHoldOrderService.submitOrder(submitOrderDto);
}
}
@@ -92,7 +112,7 @@
PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
// 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
- BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));
+ BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply(new BigDecimal(submitEntrustDto.getSymbolCnt())).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));
// 开仓手续费 建仓价*规格*手数*手续费率
BigDecimal openFeePrice = submitEntrustDto.getEntrustPrice().multiply(lotNumber)
@@ -105,8 +125,8 @@
BigDecimal entrustTotalAmount = bondAmount.add(openFeePrice).add(openFeePrice);
log.info("预付款:{}", entrustTotalAmount);
- if (entrustTotalAmount.add(bondAmount).compareTo(walletContract.getAvailableBalance()) > -1) {
- return Result.fail("可用余额不足");
+ if (entrustTotalAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0085"));
}
ContractEntrustOrderEntityMapper convert = ContractEntrustOrderEntityMapper.INSTANCE;
@@ -121,22 +141,25 @@
int i = contractEntrustOrderDao.insert(entrustOrderEntity);
- walletContract.setFrozenBalance(walletContract.getFrozenBalance().add(entrustTotalAmount));
- walletContract.setAvailableBalance(walletContract.getAvailableBalance().subtract(entrustTotalAmount));
- memberWalletContractDao.updateById(walletContract);
+ 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("委托成功");
+
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"));
} else {
- return Result.fail("委托失败");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
}
@@ -145,13 +168,13 @@
return Result.fail("功能暂未开放,敬请期待");
}
- return Result.fail("未知错误");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
@Override
- public Result findEntrustOrderList() {
+ public Result findEntrustOrderList(String symbol) {
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
- List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
+ List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol);
List<ContractEntrustVo> resultList = ContractEntrustOrderEntityMapper.INSTANCE.entityListToVoList(list);
return Result.ok(resultList);
}
@@ -164,30 +187,103 @@
// 查询该委托单是否为该用户所有
ContractEntrustOrderEntity entrustOrderEntity = contractEntrustOrderDao.selectEntrustOrderByIdAndMemberId(id, memberEntity.getId());
if (entrustOrderEntity == null) {
- return Result.fail("该委托单不存在");
+ return Result.fail(MessageSourceUtils.getString("entrust_order_not_exist"));
}
MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
BigDecimal total = entrustOrderEntity.getEntrustAmount();
- walletContractEntity.setAvailableBalance(walletContractEntity.getAvailableBalance().add(total));
- walletContractEntity.setFrozenBalance(walletContractEntity.getFrozenBalance().subtract(total));
- memberWalletContractDao.updateById(walletContractEntity);
+ memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
- orderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CANCEL);
+ orderEntity.setOrderStatus(ContractOrderEntity.ORDER_STATUS_CANCEL);
int i = contractOrderDao.insert(orderEntity);
contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());
+
+ // 插入财务流水
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
if (i > 0) {
- return Result.ok("撤销成功");
+ return Result.ok(MessageSourceUtils.getString("cancellation_success"));
}
- return Result.fail("撤销失败");
+ return Result.fail(MessageSourceUtils.getString("cancellation_fail"));
}
@Override
public List<ContractEntrustOrderEntity> selectEntrustOrderListByIds(List<Long> list) {
return contractEntrustOrderDao.selectEntrustOrderListByIds(list);
}
+
+ @Override
+ public Result addCloseContractEntrustOrder(SubmitCloseEntrustDto submitCloseEntrustDto) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectHoldOrderByMemberIdAndId(member.getId(), submitCloseEntrustDto.getId());
+ if (holdOrderEntity == null) {
+ return Result.fail("订单不存在");
+ }
+
+ if (holdOrderEntity.getSymbolCntSale() - submitCloseEntrustDto.getSymbolCnt() < 0) {
+ return Result.fail("可平张数不足");
+ }
+
+ // 获取最新价
+ BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitCloseEntrustDto.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);
+ }
+
+ 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