Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-08-08 6408a348e14193b0f625673d4e4b22b9fbd1e369

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java

@@ -37,6 +37,22 @@
                                                    @Param("driver") String driver,
                                                    @Param("state") Integer state,
                                                    Integer smsNumber);
    // 待确认订单列表
    List<Map<String,Object>> getPrivateCarOrderListConfirm(@Param("page") Page<Map<String, Object>> page,
                                                    @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("serverCarModelId") Integer serverCarModelId,
                                                    @Param("driver") String driver,
                                                    @Param("state") Integer state,
                                                    Integer smsNumber);

    /**
     * 根据专车订单ID获取专车订单详情
@@ -44,6 +60,7 @@
     * @return
     */
    Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Integer orderId);
    Map<String,Object> getPrivateCarOrderDetailByOrderNumber(@Param("orderNumber") String orderNumber);

    /**
     * 专车订单列表不分页