From 5ba559c82308ca25098424f3a2cfb46bd5816917 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 01 Apr 2021 18:39:38 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 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..2d85e29 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,14 +121,24 @@
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
Long tradeMemberId = holdOrderEntity.getMemberId();
if (CollUtil.isNotEmpty(followerSettings)) {
+ List<Object> hasExist = 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());
+ log.info("#------->{}#", followerMemberId.contains(followerSetting.getMemberId().intValue()));
+ if (CollUtil.isEmpty(followerMemberId) || !followerMemberId.contains(followerSetting.getMemberId().intValue())) {
log.info("跳出");
+ hasExist.add(followerSetting.getMemberId());
+ redisUtils.lSet(AppContants.MEMBER_HAS_FOLLOW, hasExist);
break;
+ }
+
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
}
@@ -188,6 +198,7 @@
// 预付款
BigDecimal prePaymentAmount = bondAmount.add(openFeePrice).add(openFeePrice);
+ log.info("可用的余额:{}, {}", prePaymentAmount, walletContract.getAvailableBalance());
if (prePaymentAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
log.info("可用金额不足");
LogRecordUtils.insertFollowerNotice(followerSetting.getMemberId(), NoticeConstant.MONEY_NOT_ENOUGH_TITLE, StrUtil.format(NoticeConstant.MONEY_NOT_ENOUGH_CONTENT, followTraderInfoEntity.getNickname()));
@@ -251,9 +262,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