From 47b56397ce10d4927ccc303539c103cf5d5dbe30 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 15 Nov 2020 20:28:49 +0800
Subject: [PATCH] Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv
---
src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml b/src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml
index 5897819..086de5a 100644
--- a/src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml
+++ b/src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml
@@ -52,12 +52,13 @@
a.create_time,
a.update_by,
a.update_time,
+ a.entrust_price,
(select sum(symbol_cnt) from coins_order_deal where order_id = a.id) as deal_cnt,
(select sum(deal_amount) from coins_order_deal where order_id = a.id) as deal_amount
from coins_order a
where a.order_status=1
<if test="list != null">
- and symbol in
+ and a.symbol in
<foreach collection="list" separator="," item="item" open="(" close=")">
#{item}
</foreach>
--
Gitblit v1.9.1