From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
index 357df80..120acf3 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
@@ -151,6 +151,8 @@
* @param memberId
*/
public static void wholePriceDataOperation(Long memberId) {
+ Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP;
+ log.info("操作前:{}", dataModelMap);
RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
ContractHoldOrderDao contractHoldOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
@@ -159,7 +161,14 @@
MemberWalletContractDao memberWalletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
List<ContractHoldOrderEntity> holdOrders = contractHoldOrderDao.selectHoldOrderListByMemberId(memberId);
+ log.info("持仓数量:{}", holdOrders.size());
if (CollUtil.isEmpty(holdOrders)) {
+ if (dataModelMap.get(memberId.toString()) != null) {
+ log.info("平仓后执行");
+ dataModelMap.remove(memberId.toString());
+
+ redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+ }
return;
}
@@ -176,21 +185,20 @@
wholePriceData.setHoldBond(totalHoldBond);
- List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(wholePriceData.getMemberId());
+ List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberId);
BigDecimal totalAmount = BigDecimal.ZERO;
if (CollUtil.isNotEmpty(entrustOrder)) {
for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
- totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+ totalAmount = totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
}
}
wholePriceData.setBalance(wallet.getTotalBalance().subtract(totalAmount));
wholePriceData.setMemberId(memberId);
- Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP;
dataModelMap.put(wholePriceData.getMemberId().toString(), wholePriceData);
-
redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+ log.info("dataModelMap为:{}", dataModelMap);
}
}
--
Gitblit v1.9.1