From 71f7a93df3ec759ee33701fcc7e9d57f553d6cba Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 04 Mar 2021 17:46:43 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 1d8bd08..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
@@ -34,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;
@@ -84,6 +86,9 @@
@Resource
private MemberSettingDao memberSettingDao;
+ @Autowired
+ private FollowProducer followProducer;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -92,11 +97,12 @@
// 查询交易员订单
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(id);
- while (holdOrderEntity == null) {
+ if (holdOrderEntity == null) {
try {
log.info("等待事务提交:{}", id);
Thread.sleep(200);
- holdOrderEntity = contractHoldOrderDao.selectById(id);
+ followProducer.sendAddFollowOrder(id);
+ return;
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -120,9 +126,9 @@
//更新更新消息提醒的状态
MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(followerSetting.getId());
if(ObjectUtil.isNotEmpty(memberSettingEntity)){
+ Long memberId = memberSettingEntity.getMemberId();
log.info("更新更新消息提醒的状态");
- memberSettingEntity.setMessageReminder(1);
- memberSettingDao.updateById(memberSettingEntity);
+ memberSettingDao.updateMessageReminderByMemberId(memberId);
}
if (!followerSetting.getSymbols().contains(holdOrderEntity.getSymbol().replace("/USDT", ""))) {
--
Gitblit v1.9.1