From fe0371840d353ce8b39e3811a9d87108cfd84253 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 02 Apr 2021 15:52:26 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 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 4f8a49e..90a595e 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
@@ -123,24 +123,27 @@
if (CollUtil.isNotEmpty(followerSettings)) {
List<Object> hasExist = new ArrayList<>();
for (FollowFollowerSettingEntity followerSetting : followerSettings) {
- synchronized (this) {
- // 加redis锁，同一个用户不能同时触发两个跟单任务，否则会出现金额问题
- while (true) {
- 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;
- }
+ // 加redis锁，同一个用户不能同时触发两个跟单任务，否则会出现金额问题
+ while (true) {
+ boolean flag = redisUtils.setNotExist(AppContants.MEMBER_HAS_FOLLOW + "_" + followerSetting.getMemberId(), "1", 5);
+// 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();
- }
+ if (flag) {
+ log.info("跳出");
+ break;
+ }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
}
@@ -207,6 +210,32 @@
continue;
}
+ boolean flag = false;
+ while(true) {
+ log.info("----循环更新----");
+ MemberWalletContractEntity updateEntity = new MemberWalletContractEntity();
+ updateEntity.setAvailableBalance(prePaymentAmount.negate());
+ updateEntity.setTotalBalance(openFeePrice.negate());
+ updateEntity.setId(walletContract.getId());
+ updateEntity.setVersion(walletContract.getVersion());
+ int i = memberWalletContractDao.updateWalletContractWithVersion(updateEntity);
+ if (i > 0) {
+ break;
+ }
+
+ walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(followerSetting.getMemberId(), CoinTypeEnum.USDT.name());
+ 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()));
+ flag = true;
+ break;
+ }
+ }
+
+ if (flag) {
+ continue;
+ }
+
MemberEntity memberEntity = memberDao.selectById(followerSetting.getMemberId());
// 强平价
BigDecimal forceClosingPrice = CalculateUtil.getForceSetPrice(bondAmount, openPrice, symbolCnt, lotNumber, holdOrderEntity.getOpeningType(), memberEntity);
@@ -237,7 +266,7 @@
contractHoldOrderDao.insert(followHoldOrder);
int i = contractOrderDao.insert(contractOrderEntity);
if (i > 0) {
- memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
+// memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
FollowFollowerOrderRelationEntity relationEntity = new FollowFollowerOrderRelationEntity();
relationEntity.setIsShow(FollowFollowerOrderRelationEntity.IS_SHOW_Y);
@@ -264,8 +293,9 @@
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 + "_" + followerSetting.getMemberId());
}
- redisUtils.del(AppContants.MEMBER_HAS_FOLLOW);
+// redisUtils.del(AppContants.MEMBER_HAS_FOLLOW);
}
}
--
Gitblit v1.9.1