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

Pu Zhibing

昨天 bf2acefcf5ba801d3e4a4f507c5f064fc93625cc

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml

@@ -87,15 +87,49 @@
    </select>

    <select id="queryMyOrderList" resultType="java.util.Map">
        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,
        state as state
        from app_order_ride where userId = #{uid} order by addTime desc limit #{pageNum}, #{size}
        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,
                    startLon as startLon,
                    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>