Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

4 天以前 6f77dcd80df0081466d49c933fff74afedf867b8

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -414,4 +414,50 @@
            and `type` = #{type}
        </if>
    </select>

    <select id="queryMyTripList" resultType="map">
        select
            id as orderId,
            DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
            DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        driverId as driverId,
        (2) as orderType,
        state as state,
        oldState as oldState,
        thankYouFee,
        passengersPhone,
        payMoney,
        endServiceTime,
        companyId,
        arriveTime,
        boardingTime,
        boardingLon,
        boardingLat
        from t_order_taxi where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
    </select>

    <select id="queryMyTripListAll" resultType="map">
        select
            id as orderId,
            DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
            DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        driverId as driverId,
        (2) as orderType,
        state as state,
        oldState as oldState,
        thankYouFee,
        passengersPhone,
        payMoney,
        endServiceTime,
        companyId,
        arriveTime,
        boardingTime,
        boardingLon,
        boardingLat
        from t_order_taxi where userId = #{uid} order by insertTime desc
    </select>
</mapper>