修改bug

Pu Zhibing

2 天以前 e809f5955584e600d8612540ea814977c49774c2

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

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.system.service;

import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.DriverRankVo;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.baomidou.mybatisplus.service.IService;
import org.apache.ibatis.annotations.Param;
@@ -36,7 +37,31 @@
                                                    @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,
                                                    Integer payType);
    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获取快车订单详情
@@ -47,4 +72,19 @@


    List<Map<String,Object>> getSurcharge(Object id,Integer orderType);

    List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);


    List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);


    /**
     * 根据推广活动id获取推广汇总数据
     * @param id
     * @param driverName
     * @return
     */
    List<DriverRankVo> getDriverPromotionActivity(Integer id, String driverName);

}