From 11dfc3615f5d6902f96dc8be9d6c3b0f347dbe2d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 14:58:20 +0800
Subject: [PATCH] modify bond amount
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 c3a3262..9fdfb57 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
@@ -385,17 +385,7 @@
// 若该用户为交易员且开启带单模式，则发送带单异步
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);
-
- followProducer.sendAddFollowOrder(holdOrderEntity.getId());
+ sendFollowOrder(tradeInfo, holdOrderEntity);
// ThreadPoolUtils.sendFollowOrderTask(holdOrderEntity.getId());
}
// 提交成功
@@ -405,6 +395,20 @@
return Result.fail(MessageSourceUtils.getString("member_service_0067"));
}
+ @Override
+ public void sendFollowOrder(FollowTraderInfoEntity tradeInfo, ContractHoldOrderEntity holdOrderEntity) {
+ 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);
+
+ followProducer.sendAddFollowOrder(holdOrderEntity.getId());
+ }
/**
* 全仓模式--若当前已经存在持仓，则合并当前持仓
@@ -859,7 +863,7 @@
BigDecimal newPriceSymbol = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
List<ContractEntrustOrderEntity> entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
- List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), ContractOrderEntity.CONTRACTTYPE_NORMAL);
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), null);
MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
// if (memberEntity.getContractPositionType().equals(ContractEntrustOrderEntity.POSITION_TYPE_ADD)) {
// // 当前合约委托单
--
Gitblit v1.9.1