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 | 5 ++++-
1 files changed, 4 insertions(+), 1 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 1eb5312..ccabadd 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
@@ -164,6 +164,7 @@
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));
@@ -185,13 +186,15 @@
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);
--
Gitblit v1.9.1