From 97db260bb295a4ee6bf9855900a7a220525508a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 01 Apr 2021 15:47:17 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 49db1d9..466fd47 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
@@ -121,13 +121,16 @@
         BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
         Long tradeMemberId = holdOrderEntity.getMemberId();
         if (CollUtil.isNotEmpty(followerSettings)) {
+            List<Long> hasExists = new ArrayList<>();
             for (FollowFollowerSettingEntity followerSetting : followerSettings) {
                 // 加redis锁,同一个用户不能同时触发两个跟单任务,否则会出现金额问题
                 while(true) {
-                    Long followerMemberId = (Long) redisUtils.get(AppContants.MEMBER_HAS_FOLLOW);
-                    log.info("#跟单用户任务已存在:{}#", followerMemberId);
-                    if (followerMemberId == null) {
+                    List<Object> followerMemberId =  redisUtils.lGet(AppContants.MEMBER_HAS_FOLLOW, 0, -1);
+                    log.info("#跟单用户任务已存在:{}, 当前:{}#", followerMemberId, followerSetting.getMemberId());
+                    if (CollUtil.isEmpty(followerMemberId) || !followerMemberId.contains(followerSetting.getMemberId())) {
                         log.info("跳出");
+                        hasExists.add(followerSetting.getMemberId());
+                        redisUtils.lSet(AppContants.MEMBER_HAS_FOLLOW, hasExists);
                         break;
                     }
                 }
@@ -251,9 +254,8 @@
                         LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.OPEN_ORDER_TITLE, StrUtil.format(NoticeConstant.OPEN_ORDER_CONTENT, holdOrderEntity.getSymbol() + "开空", openPrice.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), followTraderInfoEntity.getNickname()));
                     }
                 }
-
-                redisUtils.del(AppContants.MEMBER_HAS_FOLLOW);
             }
+            redisUtils.del(AppContants.MEMBER_HAS_FOLLOW);
         }
     }
 

--
Gitblit v1.9.1