From 57c2b6875b5f026a1432f3209471d6b4503f43fc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 29 Oct 2024 13:35:05 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/UserPositionMapper.xml | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/UserPositionMapper.xml b/src/main/resources/mapper/UserPositionMapper.xml
index 1edb775..a50f9bb 100644
--- a/src/main/resources/mapper/UserPositionMapper.xml
+++ b/src/main/resources/mapper/UserPositionMapper.xml
@@ -44,7 +44,7 @@
id, position_type, position_sn, user_id, nick_name, agent_id, stock_name, stock_code,
stock_gid, stock_spell, buy_order_id, buy_order_time, buy_order_price, sell_order_id,
sell_order_time, sell_order_price, profit_target_price, stop_target_price, order_direction,
- order_num, order_lever, order_total_price, order_fee, order_spread, order_stay_fee,
+ order_num, order_lever, order_total_price, order_fee, order_spread, order_stay_fee,
order_stay_days, profit_and_lose, all_profit_and_lose,is_lock,lock_msg,stock_plate,spread_rate_price,margin_add
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -65,7 +65,7 @@
buy_order_price, sell_order_id, sell_order_time,
sell_order_price, profit_target_price, stop_target_price,
order_direction, order_num, order_lever,
- order_total_price, order_fee, order_spread,
+ order_total_price, order_fee, order_spread,
order_stay_fee, order_stay_days, profit_and_lose,
all_profit_and_lose, is_lock, lock_msg,stock_plate,spread_rate_price)
values (#{id,jdbcType=INTEGER}, #{positionType,jdbcType=INTEGER}, #{positionSn,jdbcType=VARCHAR},
@@ -436,27 +436,26 @@
<select id="findMyPositionByCodeAndSpell" parameterType="map" resultMap="BaseResultMap">
SELECT
- <include refid="Base_Column_List"/>
- FROM user_position
+ u.*
+ FROM user_position u left join stock s on u.stock_code = s.stock_code
<where>
- user_id = #{uid}
+ u.user_id = #{uid}
+ and s.stock_type = #{stockType}
<if test="state != null ">
<if test="state == 0">
- and sell_order_id is null
+ and u.sell_order_id is null
</if>
<if test="state == 1">
- and sell_order_id is not null
+ and u.sell_order_id is not null
</if>
</if>
<if test="stockCode != null and stockCode != '' ">
- and stock_code like CONCAT('%','${stockCode}','%')
+ and u.stock_code like CONCAT('%','${stockCode}','%')
</if>
<if test="stockSpell != null and stockSpell != '' ">
- and stock_spell like CONCAT('%','${stockSpell}','%')
+ and u.stock_spell like CONCAT('%','${stockSpell}','%')
</if>
-<!-- <if test="stockType != null and stockType!= ''">-->
-<!-- and stock_gid = #{stockType}-->
-<!-- </if>-->
+
</where>
--
Gitblit v1.9.3