From a8bc04c1c9270a2a7f28d6113bc6f097496c50aa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 14:40:25 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new

---
 src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java |    2 +-
 1 files changed, 1 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 d2ad1ec..120acf3 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
@@ -185,7 +185,7 @@
 
         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) {

--
Gitblit v1.9.1