java/QianYunTong.git

			@@ -58,9 +58,6 @@
			order by r.startTime asc
			</if>
			<if test="type==4">
			order by calculate_distance(#{lat},#{lon},r.startLat, r.startLon) asc
			</if>
			<if test="type==5">
			order by r.money desc
			</if>
			LIMIT #{current},#{size}
			@@ -81,10 +78,58 @@
			<select id="getOrderInfo" resultType="com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideInfoVo">
			select r.addTime,r.startTime,r.endName,r.startName,r.money,r.id as userOrderId,r.state,t.id as driverOrderId,r.isEvaluate,t.isComplaint,
			r.num,r.userId,r.driverId ,u.avatar as headImg,CASE when r.isDai=1 then r.lxPhone else u.phone end as phone,u.sex,u.nickName as name,u.totalOrders,
			calculate_distance(#{lat},#{lon},r.startLat, r.startLon) as distance,r.startLat as lat, r.startLon as lon
			calculate_distance(#{lat},#{lon},r.startLat, r.startLon) as distance,r.startLat as lat, r.startLon as lon,r.endLon endLon,r.endLat endLat,
			t.startLat as latDriver, t.startLon as lonDriver,t.endLon endLonDriver,t.endLat endLatDriver
			from (select * from app_order_ride where id=#{userOrderId}) r
			left join app_order_travel t on r.travelId=t.id
			left join app_driver_ride d on d.id=r.driverId
			left join t_user u on r.userId=u.id
			</select>

			<select id="queryMyOrderList" resultType="java.util.Map">
			SELECT
			*
			FROM
			(
			SELECT
			id AS orderId,
			DATE_FORMAT( addTime, '%Y-%m-%d %H:%i' ) AS orderTime,
			DATE_FORMAT( startTime, '%m月%d日 %H:%i' ) AS time,
			startName AS startAddress,
			endName AS endAddress,
			driverId AS driverId,
			( 8 ) AS orderType,
			1 AS rideUserType,
			startLon as startLon,
			startLat as startLat,
			state AS state
			FROM
			app_order_ride
			WHERE
			userId = #{uid}

			UNION all

			SELECT
			t1.id AS orderId,
			DATE_FORMAT( t1.addTime, '%Y-%m-%d %H:%i' ) AS orderTime,
			DATE_FORMAT( t1.startTime, '%m月%d日 %H:%i' ) AS time,
			t1.startName AS startAddress,
			t1.endName AS endAddress,
			t1.driverId AS driverId,
			( 8 ) AS orderType,
			2 AS rideUserType,
			t1.startLon as startLon,
			t1.startLat as startLat,
			t1.state AS state
			FROM
			app_order_travel t1
			LEFT JOIN t_user t2 ON t1.driverId = t2.driverId
			WHERE
			t2.id = #{uid}
			) as t
			ORDER BY
			t.orderTime DESC
			LIMIT #{pageNum}, #{size}
			</select>
			</mapper>