From cda4ee6f370768c279cf937bab6468eb9eb6ce2e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 17:19:31 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 ec0f4b3..cda4dcf 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
@@ -13,17 +13,17 @@
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.mapper.ContractEntrustOrderEntityMapper;
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.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 +62,9 @@
@Resource
private OrderProducer producer;
+ @Resource
+ private ContractHoldOrderService contractHoldOrderService;
+
@Transactional(rollbackFor = Exception.class)
@Override
public Result addContractEntrustOrder(SubmitEntrustDto submitEntrustDto) {
@@ -75,14 +78,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);
}
}
@@ -105,8 +118,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;
@@ -128,13 +141,18 @@
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"));
}
}
@@ -143,7 +161,7 @@
return Result.fail("功能暂未开放,敬请期待");
}
- return Result.fail("未知错误");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
@Override
@@ -162,7 +180,7 @@
// 查询该委托单是否为该用户所有
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());
@@ -176,10 +194,13 @@
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
--
Gitblit v1.9.1