From 0469ade9be848d97eefb92f3e584441d89e6b69d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 19:32:05 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index 06164aa..b7304af 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -19,6 +19,7 @@
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.contract.service.ContractOrderService;
+import com.xcong.excoin.modules.contract.service.RabbitOrderService;
import com.xcong.excoin.modules.documentary.common.NoticeConstant;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao;
@@ -39,6 +40,7 @@
import com.xcong.excoin.modules.member.service.MemberWalletContractService;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
+import com.xcong.excoin.rabbit.producer.FollowProducer;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.*;
import lombok.extern.slf4j.Slf4j;
@@ -104,6 +106,9 @@
private RedisUtils redisUtils;
@Resource
private FollowOrderOperationService followOrderOperationService;
+
+ @Resource
+ private FollowProducer followProducer;
public void dealOrderFromMq(List<OrderModel> list, Integer type) {
if (CollectionUtils.isNotEmpty(list)) {
@@ -171,6 +176,21 @@
if (CollUtil.isNotEmpty(entrustOrders)) {
for (ContractEntrustOrderEntity entrustOrder : entrustOrders) {
contractEntrustOrderDao.deleteById(entrustOrder.getId());
+ }
+ }
+ }
+
+ private void closingFollowerOrders(MemberEntity memberEntity, ContractHoldOrderEntity holdOrderEntity, ContractOrderEntity contractOrderEntity) {
+ // 判断当前持仓是否为跟单订单
+ if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == holdOrderEntity.getContractType()) {
+ FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByOrderId(holdOrderEntity.getId());
+ updateFollowOrderRelation(holdOrderEntity.getId(), contractOrderEntity.getId());
+
+ // 若为交易员，则平仓跟随者订单
+ if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ followOrderOperationService.closingFollowOrders(holdOrderEntity.getOrderNo());
+ } else {
+ LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.CLOSE_ORDER_TITLE, StrUtil.format(NoticeConstant.CLOSE_ORDER_CONTENT, contractOrderEntity.getSymbol(), contractOrderEntity.getClosingPrice().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), contractOrderEntity.getRewardAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString(), traderInfoEntity.getNickname()));
}
}
}
@@ -269,6 +289,8 @@
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
+ } else {
+ closingFollowerOrders(memberEntity, order, contractOrderEntity);
}
}
}
@@ -370,6 +392,8 @@
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
+ } else {
+ closingFollowerOrders(memberEntity, order, contractOrderEntity);
}
}
}
@@ -469,6 +493,8 @@
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
+ } else {
+ closingFollowerOrders(memberEntity, order, contractOrderEntity);
}
}
}
@@ -567,6 +593,8 @@
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
+ } else {
+ closingFollowerOrders(memberEntity, order, contractOrderEntity);
}
}
}
@@ -625,6 +653,16 @@
contractHoldOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_LESS);
}
+ // 判断是否开启了带单
+ boolean isOpenFollow = false;
+ FollowTraderInfoEntity tradeInfo = null;
+ if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ tradeInfo = followTraderInfoDao.selectTraderInfoByMemberId(memberEntity.getId());
+ if (FollowTraderInfoEntity.ISOPEN_Y.equals(tradeInfo.getIsOpen())) {
+ isOpenFollow = true;
+ }
+ }
+
//持仓单赋值
contractHoldOrderEntity.setMemberId(memId);
contractHoldOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
@@ -647,6 +685,7 @@
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
+ contractHoldOrderEntity.setContractType(isOpenFollow ? ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY : ContractOrderEntity.CONTRACTTYPE_NORMAL);
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -675,6 +714,12 @@
//返佣
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
+
+ // 若该用户为交易员且开启带单模式，则发送带单异步
+ if (isOpenFollow) {
+ contractHoldOrderService.sendFollowOrder(tradeInfo, contractHoldOrderEntity);
+ }
+
}
}
}
@@ -916,10 +961,10 @@
QueryWrapper<FollowFollowerSettingEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("member_id",coinsOrder.getMemberId());
FollowFollowerSettingEntity followFollowerSettingEntity = followFollowerSettingDao.selectOne(queryWrapper);
- if(ObjectUtil.isNotEmpty(followFollowerSettingEntity)){
- Long traderMemberId = followFollowerSettingEntity.getTraderMemberId();
- followFollowerProfitDao.updateFollowerProfitByTradeMemberId(coinsOrder.getBondAmount().negate(), coinsOrder.getBondAmount().negate(), traderMemberId, memberEntity.getId());
- }
+// if(ObjectUtil.isNotEmpty(followFollowerSettingEntity)){
+// Long traderMemberId = followFollowerSettingEntity.getTraderMemberId();
+// followFollowerProfitDao.updateFollowerProfitByTradeMemberId(coinsOrder.getBondAmount().negate(), coinsOrder.getBondAmount().negate(), traderMemberId, memberEntity.getId());
+// }
FollowTraderInfoEntity followTraderInfoEntity = followTraderInfoDao.selectById(followFollowerSettingEntity.getTraderId());
//更新跟随者-订单关联表
updateFollowOrderRelation(coinsOrder.getId(), contractOrderEntity.getId());
--
Gitblit v1.9.1