新增需求

曾富康

2026-06-22 e4f50565f585ac3bb7355fe7b9da794bb855113f

 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/controller/OrderPrivateCarController.java

@@ -75,23 +75,27 @@
            @ApiImplicitParam(value = "乘客电话（代下单必传）", name = "passengersPhone", required = false, dataType = "string"),
            @ApiImplicitParam(value = "乘车人数", name = "peopleNum", required = true, dataType = "int"),
            @ApiImplicitParam(value = "乘车类型(1=独享，2=一口价，3=拼车)", name = "rideType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "乘车类型(1=普通叫车流程，2=快捷叫车流程)", name = "callType", required = false, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer orderType, Integer substitute, String placementLon, String placementLat, String startLon, String startLat,
                                                       String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer orderSource, Integer driverId,
                                                       Integer type, HttpServletRequest request,Integer peopleNum,Integer rideType){
                                                       Integer type, HttpServletRequest request,Integer peopleNum,Integer rideType, Integer callType){
        try {
            Integer uid = userInfoService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            if (travelTime.getTime() > (System.currentTimeMillis() + 600000)) {
            // 快捷叫车只支持实时单，不按预约时间转预约单。
            if (Integer.valueOf(2).equals(callType)) {
                orderType = 1;
            } else if (travelTime.getTime() > (System.currentTimeMillis() + 600000)) {
                orderType = 2;
            }else {
                orderType = 1;
            }
            return orderPrivateCarService.saveOrderPrivateCar(serverCarModelId, travelTime, orderType, substitute, placementLon, placementLat,
                    startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, type, uid,peopleNum,rideType);
                    startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, type, uid,peopleNum,rideType, callType);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -121,23 +125,27 @@
            @ApiImplicitParam(value = "乘客姓名（代下单必传）", name = "passengers", required = false, dataType = "string"),
            @ApiImplicitParam(value = "乘客电话（代下单必传）", name = "passengersPhone", required = false, dataType = "string"),
            @ApiImplicitParam(value = "乘车人数", name = "peopleNum", required = true, dataType = "int"),
            @ApiImplicitParam(value = "叫车方式（1=普通叫车，2=快捷叫车）", name = "callType", required = false, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<BaseWarpper> saveOrderPrivateCars(String serverCarModel, Date travelTime, Integer orderType, Integer substitute, String placementLon, String placementLat, String startLon, String startLat,
                                                       String startAddress, String endLon, String endLat, String endAddress, String passengers, String passengersPhone, Integer orderSource, Integer driverId,
                                                       HttpServletRequest request,Integer peopleNum){
                                                       HttpServletRequest request,Integer peopleNum, Integer callType){
        try {
            Integer uid = userInfoService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            if (travelTime.getTime() > (System.currentTimeMillis() + 600000)) {
            // 快捷叫车只支持实时单，不按预约时间转预约单。
            if (Integer.valueOf(2).equals(callType)) {
                orderType = 1;
            } else if (travelTime.getTime() > (System.currentTimeMillis() + 600000)) {
                orderType = 2;
            }else {
                orderType = 1;
            }
            return orderPrivateCarService.saveOrderPrivateCars(serverCarModel, travelTime, orderType, substitute, placementLon, placementLat,
                    startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, uid,peopleNum);
                    startLon, startLat, startAddress, endLon, endLat, endAddress, passengers, passengersPhone, orderSource, driverId, uid,peopleNum, callType);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();