From 25c3d8e604e2ca24da6aeb2c018acafca9b11c38 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 11:29:20 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 28d864e..b8e861e 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.xcong.excoin.common.contants.AppContants;
@@ -18,9 +19,14 @@
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.documentary.common.NoticeConstant;
+import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao;
import com.xcong.excoin.modules.documentary.dao.FollowFollowerSettingDao;
+import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;
+import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
import com.xcong.excoin.modules.documentary.service.FollowOrderOperationService;
import com.xcong.excoin.modules.member.dao.AgentReturnDao;
import com.xcong.excoin.modules.member.dao.MemberSettingDao;
@@ -69,6 +75,10 @@
@Resource
FollowFollowerSettingDao followFollowerSettingDao;
+ @Resource
+ FollowFollowerOrderRelationDao followFollowerOrderRelationDao;
+ @Resource
+ FollowTraderInfoDao followTraderInfoDao;
@Resource
CacheSettingUtils cacheSettingUtils;
@@ -900,16 +910,21 @@
if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == coinsOrder.getContractType() && MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
followOrderOperationService.closingFollowOrders(coinsOrder.getOrderNo());
}
- // 如果不是交易员，那么需要更新他的个人跟随者收益记录
+ // 如果不是交易员，
if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == coinsOrder.getContractType() && !MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
- //获取当前的跟单设置（一次只允许跟单一个人）,获取交易员MemberId
+ //更新他的个人跟随者收益记录
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());
+ //增加爆仓消息提醒
+ LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.BOMB_ORDER_TITLE, StrUtil.format(NoticeConstant.BOMB_ORDER_CONTENT, contractOrderEntity.getSymbol(),followTraderInfoEntity.getNickname()));
}
} else {
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
@@ -942,6 +957,21 @@
}
}
+ /**
+ * 更新跟单订单关系
+ *
+ * @param oldOrderId 当前持仓ID
+ * @param newOrderId 历史订单ID
+ */
+ public void updateFollowOrderRelation(Long oldOrderId, Long newOrderId) {
+ FollowFollowerOrderRelationEntity orderRelationEntity = followFollowerOrderRelationDao.selectNowOneByorderId(oldOrderId);
+ if (orderRelationEntity != null) {
+ orderRelationEntity.setOrderId(newOrderId);
+ orderRelationEntity.setOrderType(FollowFollowerOrderRelationEntity.ORDER_TYPE_HISTORY);
+ followFollowerOrderRelationDao.updateById(orderRelationEntity);
+ }
+ }
+
public void calYj(Long mid, BigDecimal money, ContractOrderEntity order, int type) {
PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
if (money != null) {
--
Gitblit v1.9.1