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

Pu Zhibing

9 天以前 120f73549d7898b8239ffc21f3320a8dbad2c2b1

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

@@ -36,7 +36,30 @@
                                                    @Param("serverCarModelId") Integer serverCarModelId,
                                                    @Param("driver") String driver,
                                                    @Param("state") Integer state,
                                                    @Param("rideType") Integer rideType);
                                                    @Param("rideType") Integer rideType,
                                                    Integer abnormal,
                                                    Integer promotion,
                                                    String promotionUser,
                                                    Integer abnormalStatus);
    List<Map<String,Object>> getPrivateCarOrderListExport(@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,
                                                    @Param("rideType") Integer rideType,
                                                    Integer abnormal,
                                                    Integer promotion,
                                                    String promotionUser,
                                                    Integer abnormalStatus);

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