From 41561cbb4ee65c78f2e7e523b8b07d5638c80c3a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 30 Oct 2025 16:02:39 +0800
Subject: [PATCH] 新增借贷配置管理
---
trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index 16ffc97..a8f4288 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -43,26 +43,30 @@
ORDER BY add_time DESC
</select>
- <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.ExchangeApplyOrderDz" parameterType="map">
+ <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- *
- FROM t_exchange_apply_order_dz
+ t.*,s.stock_name
+ FROM t_exchange_apply_order_dz t
+ LEFT JOIN t_stock_dz s ON t.dz_id=s.uuid
WHERE 1=1
<if test="stockType != null and stockType != '' ">
- AND stock_type = #{stockType}
+ AND s.stock_type = #{stockType}
</if>
<if test="state != null and state != ''">
AND t.state = #{state}
</if>
- <if test="userId != null and userId != '' ">
- AND party_id = #{userId}
+ <if test="state == null">
+ AND t.state != 'position'
</if>
- ORDER BY create_time DESC
+ <if test="userId != null and userId != '' ">
+ AND t.party_id = #{userId}
+ </if>
+ ORDER BY t.create_time DESC
</select>
<select id="getDzCheckList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- t.*,u.user_name,u.user_code,s.stock_type
+ t.*,u.user_name,u.user_code,s.stock_name
FROM t_exchange_apply_order_dz t
LEFT JOIN tz_user u ON t.party_id = u.user_id
LEFT JOIN t_stock_dz s ON s.uuid = t.dz_id
--
Gitblit v1.9.3