From a7ee66c023bf37798e87c4c801a9c99cfbc97f90 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 18:19:27 +0800
Subject: [PATCH] 20210304  最大跟随人数

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
index 3cc93a9..e0f411b 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
@@ -1,6 +1,7 @@
 package com.xcong.excoin.modules.documentary.service.impl;
 
 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.Wrapper;
@@ -33,12 +34,14 @@
 import com.xcong.excoin.modules.member.entity.*;
 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.CacheSettingUtils;
 import com.xcong.excoin.utils.CalculateUtil;
 import com.xcong.excoin.utils.LogRecordUtils;
 import com.xcong.excoin.utils.ThreadPoolUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -83,15 +86,30 @@
     @Resource
     private MemberSettingDao memberSettingDao;
 
+    @Autowired
+    private FollowProducer followProducer;
+
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void addFollowerOrder(Long id) {
-        log.info("进入跟单处理逻辑");
+        log.info("进入跟单处理逻辑 : {}", id);
         // 查询交易员订单
         ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(id);
 
+        if (holdOrderEntity == null) {
+            try {
+                log.info("等待事务提交:{}", id);
+                Thread.sleep(200);
+                followProducer.sendAddFollowOrder(id);
+                return;
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
         List<FollowFollowerSettingEntity> followerSettings = followFollowerSettingDao.selectAllFollowerSettingByTradeMemberId(holdOrderEntity.getMemberId());
+        log.info("进入跟单处理逻辑---跟单人数"+followerSettings.size());
         // 开仓价
         BigDecimal openPrice = holdOrderEntity.getOpeningPrice();
         PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
@@ -105,6 +123,14 @@
         if (CollUtil.isNotEmpty(followerSettings)) {
             for (FollowFollowerSettingEntity followerSetting : followerSettings) {
 
+            	//更新更新消息提醒的状态
+                MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(followerSetting.getId());
+                if(ObjectUtil.isNotEmpty(memberSettingEntity)){
+                	Long memberId = memberSettingEntity.getMemberId();
+                	log.info("更新更新消息提醒的状态");
+                	memberSettingDao.updateMessageReminderByMemberId(memberId);
+                }
+            	
                 if (!followerSetting.getSymbols().contains(holdOrderEntity.getSymbol().replace("/USDT", ""))) {
                     log.info("不在跟单币种内,不跟单:{},{}", followerSetting.getSymbols(), holdOrderEntity.getSymbol());
                     continue;
@@ -215,12 +241,6 @@
                         LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), holdOrderEntity.getSymbol(), "买跌持仓", "买跌:" + holdOrderEntity.getSymbol());
                         LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.OPEN_ORDER_TITLE, StrUtil.format(NoticeConstant.OPEN_ORDER_CONTENT, holdOrderEntity.getSymbol() + "开空", openPrice, followTraderInfoEntity.getNickname()));
                     }
-                    //更新更新消息提醒的状态
-                    Wrapper<MemberSettingEntity> queryWrapperOrepool = new QueryWrapper<>();
-                    ((QueryWrapper<MemberSettingEntity>) queryWrapperOrepool).eq("member_id", memberEntity.getId());
-                    MemberSettingEntity memberWalletOrepoolEntity = memberSettingDao.selectOne(queryWrapperOrepool);
-                    memberWalletOrepoolEntity.setMessageReminder(1);
-                    memberSettingDao.updateById(memberWalletOrepoolEntity);
                 }
             }
         }

--
Gitblit v1.9.1