java/IgoTravel.git

			@@ -161,7 +161,8 @@
			ifnull(discountMoney, 0) as discountMoney,
			(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney,
			cancelMidway,
			tripId
			tripId,
			remark
			from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
			</select>

			@@ -305,4 +306,22 @@
			UNIX_TIMESTAMP(insertTime) as insertTime
			from t_order_logistics where userId = #{uid} and state in (8, 9) and redPacketId is not null
			</select>


			<select id="queryByState" resultType="OrderLogistics">
			select *
			from t_order_logistics where isDelete = 1 and isFrozen = 1 and userId = #{uid}
			<if test="null != orderType">
			and orderType = #{orderType}
			</if>
			<if test="null != state">
			and state in
			<foreach collection="state" item="item" index="index" open="(" separator="," close=")">
			#{item}
			</foreach>
			</if>
			<if test="null != type">
			and `type` = #{type}
			</if>
			</select>
			</mapper>