java/IgoTravel.git

			@@ -128,7 +128,8 @@
			trackId as trackId,
			isDelete as isDelete,
			telX as telX,
			bindId as bindId
			bindId as bindId,
			tripId
			from t_order_logistics where isDelete = 1
			<if test="null != start and null != end">
			and insertTime between #{start} and #{end}
			@@ -159,7 +160,10 @@
			payMoney as payMoney,
			ifnull(discountMoney, 0) as discountMoney,
			(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney,
			cancelMidway
			cancelMidway,
			tripId,
			remark,
			companyId
			from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
			</select>

			@@ -283,7 +287,8 @@
			h.reason as cancelReason,
			h.remark as cancelRemark,
			a.tripId,
			a.snatchOrderTime
			a.snatchOrderTime,
			a.startDuration
			from t_order_logistics a
			left join t_driver b on (a.driverId = b.id)
			left join t_car c on (a.carId = c.id)
			@@ -303,4 +308,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>