Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-23 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java

@@ -23,18 +23,39 @@
     * @return
     */
    List<Map<String,Object>> getTaxiOrderList(@Param("page") Page<Map<String, Object>> page,
                                               @Param("beginTime") String beginTime,
                                               @Param("endTime") String endTime,
                                              @Param("beginTime") String beginTime,
                                              @Param("endTime") String endTime,
                                              @Param("roleType") Integer roleType,
                                              @Param("nowUserId") Integer nowUserId,
                                               @Param("orderNum") String orderNum,
                                               @Param("orderSource") Integer orderSource,
                                               @Param("userName") String userName,
                                               @Param("userPhone") String userPhone,
                                               @Param("passengers") String passengers,
                                               @Param("passengersPhone") String passengersPhone,
                                               @Param("driver") String driver,
                                               @Param("state") Integer state);
                                              @Param("orderNum") String orderNum,
                                              @Param("orderSource") Integer orderSource,
                                              @Param("userName") String userName,
                                              @Param("userPhone") String userPhone,
                                              @Param("passengers") String passengers,
                                              @Param("passengersPhone") String passengersPhone,
                                              @Param("driver") String driver,
                                              @Param("state") Integer state,
                                              @Param("abnormal") Integer abnormal,
                                              @Param("promotion") Integer promotion,
                                              @Param("promotionUser") String promotionUser,
                                              @Param("abnormalStatus") Integer abnormalStatus);
    List<Map<String,Object>> getTaxiOrderListExport(
                                              @Param("beginTime") String beginTime,
                                              @Param("endTime") String endTime,
                                              @Param("roleType") Integer roleType,
                                              @Param("nowUserId") Integer nowUserId,
                                              @Param("orderNum") String orderNum,
                                              @Param("orderSource") Integer orderSource,
                                              @Param("userName") String userName,
                                              @Param("userPhone") String userPhone,
                                              @Param("passengers") String passengers,
                                              @Param("passengersPhone") String passengersPhone,
                                              @Param("driver") String driver,
                                              @Param("state") Integer state,
                                              @Param("abnormal") Integer abnormal,
                                              @Param("promotion") Integer promotion,
                                              @Param("promotionUser") String promotionUser,
                                              @Param("abnormalStatus") Integer abnormalStatus);

    /**
     * 根据出租车订单ID获取出租车订单详情