java/IgoTravel.git

			@@ -153,7 +153,7 @@
			oldState as oldState,
			telX as telX,
			bindId as bindId
			from t_order_private_car where isDelete = 1 and userId = #{uid}
			from t_order_private_car where isDelete = 1 and isFrozen = 1 and userId = #{uid}
			<if test="null != orderType">
			and orderType = #{orderType}
			</if>
			@@ -321,7 +321,8 @@
			isDelete as isDelete,
			oldState as oldState,
			telX as telX,
			bindId as bindId
			bindId as bindId,
			tripId
			from t_order_private_car where isDelete = 1 and userId = #{uid}
			<if test="null != state">
			and state in
			@@ -343,7 +344,10 @@
			driverId as driverId,
			(1) as orderType,
			state as state,
			oldState as oldState
			oldState as oldState,
			isFrozen,
			cancelMidway,
			tripId
			from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
			</select>

			@@ -441,7 +445,12 @@
			h.money as cancelMoney,
			h.reason as cancelReason,
			h.remark as cancelRemark,
			a.isFree,a.moneyType,a.moneyTime
			a.isFree,
			a.moneyType,
			a.moneyTime,
			a.isFrozen,
			a.tripId,
			DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime
			from t_order_private_car a
			left join t_driver b on (a.driverId = b.id)
			left join t_car c on (a.carId = c.id)