From a8ba157aefdf0922037c197daba6b859bc30bf22 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 30 八月 2019 09:24:26 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 7e1fceb..b77ae8c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -193,6 +193,16 @@
 	</select>
 	
 	
+	<select id="listBySourceTypeAndTradeIdList" resultMap="BaseResultMap">SELECT *
+		FROM
+		yeshi_ec_common_order co WHERE co.co_source_type=#{sourceType} 
+		<if test="tradeIdList!=null">
+			<foreach collection="tradeIdList" item="tradeId" open=" and (" close=")" separator=" or ">
+				co.co_trade_id=#{tradeId}
+			</foreach>
+		</if>
+	</select>
+	
 	
 	<select id="listBySourceTypeAndStateAndThirdCrateTime" resultMap="BaseResultMap">SELECT *
 		FROM

--
Gitblit v1.8.0