From 87210a713f8a0ce2378fb81427de6d9fde459613 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 03 Feb 2021 17:20:53 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 3ae2459..ccabadd 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
@@ -152,6 +152,7 @@
*/
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);
@@ -160,8 +161,10 @@
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));
@@ -183,18 +186,21 @@
wholePriceData.setHoldBond(totalHoldBond);
List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(wholePriceData.getMemberId());
+ log.info("数量:{}", entrustOrder.size());
BigDecimal totalAmount = BigDecimal.ZERO;
if (CollUtil.isNotEmpty(entrustOrder)) {
for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
- totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+ totalAmount = totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
}
}
+ log.info("--->{}", totalAmount);
wholePriceData.setBalance(wallet.getTotalBalance().subtract(totalAmount));
wholePriceData.setMemberId(memberId);
dataModelMap.put(wholePriceData.getMemberId().toString(), wholePriceData);
-
+ redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+ log.info("dataModelMap为:{}", dataModelMap);
}
}
--
Gitblit v1.9.1