From 010efba33ae0e00ff06e5a95004e0f624f073ba7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 15:34:45 +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 |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 b1edece..b7647e3 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
@@ -144,6 +144,30 @@
 		yeshi_ec_common_order co WHERE co.co_source_type=#{sourceType} and
 		co_trade_id=#{tradeId}
 	</select>
+	
+	
+	
+	<select id="listBySourceTypeAndStateAndThirdCrateTime" resultMap="BaseResultMap">SELECT *
+		FROM
+		yeshi_ec_common_order co WHERE co.co_source_type=#{sourceType} 
+		
+		<if test="state!=null">
+			and co_state=#{state}
+		</if>
+		
+		<if test="minTime!=null">
+			and UNIX_TIMESTAMP(co_third_create_time)*1000>=#{minTime}
+		</if>
+		
+		
+		<if test="maxTime!=null">
+		    and	#{maxTime}>	UNIX_TIMESTAMP(co_third_create_time)*1000
+		</if>
+		
+		order by co_id desc
+		limit #{start},#{count}
+	</select>
+	
 
 	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
 		yeshi_ec_common_order where co_id = #{id,jdbcType=BIGINT}

--
Gitblit v1.8.0