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

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml

@@ -237,7 +237,35 @@
            companyId as companyId
        from t_order_transfer where id = #{orderId}
    </select>

    <select id="queryMyAllOrder" resultType="map">
        select
        id as id,
        (7) as type,
        ('接送机订单') as `name`,
        DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
        startAddress as startAddress,
        endAddress as endAddress,
        state as state,
        orderType as reservation,
        orderMoney as orderMoney,
        payManner as payManner,
        UNIX_TIMESTAMP(travelTime) as travelTime,
        remark as remark
        from t_order_transfer where driverId = #{driverId}
        <if test="state == 1">
            and state != 1
        </if>
        <if test="state == 2">
            and state = 7
        </if>
        <if test="state == 3">
            and state = 10
        </if>
        <if test="state == 4">
            and state in (6, 7, 8, 9)
        </if>
        order by insertTime desc
    </select>

    <select id="queryOrderInfo" resultType="map">
        select