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

liujie

2025-08-08 f604df04d1f9fe90ee543a1772a3a8cdb50d3d66

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java

@@ -14,12 +14,15 @@
import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
import com.stylefeng.guns.modular.system.model.SensitiveWords;
import com.stylefeng.guns.modular.system.model.TCarBrand;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
import com.stylefeng.guns.modular.system.service.ITCarBrandService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
import io.swagger.annotations.*;
import net.sf.json.JSONObject;
@@ -50,9 +53,6 @@
        /*顺风车设置*/
        @Autowired
        private IParamRideService paramRideService;
        /*系统设置*/
        @Autowired
        private IParamService paramService;
        /*定时任务*/
        @Autowired
        private ITimeTaskService timeTaskService;
@@ -61,7 +61,7 @@
        private IDriverRideService driverRideService;
        /*顺风车品牌*/
        @Autowired
        private IBrandService brandService;
        private ITCarBrandService carBrandService;
        /*评价*/
        @Autowired
        private IEvaluateService evaluateService;
@@ -111,7 +111,7 @@
    public Object authentication(Integer userId,String name,String  identity,Integer type) {
        try {
            if (userId == null || userId == 0) {
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            /*发布顺风车行程实名认证*/
            UserApply apply=new UserApply();
@@ -129,6 +129,7 @@
                /*修改用户实名认证通过*/
                UserInfo userInfo=new UserInfo();
                userInfo.setId(userId);
                userInfo.setIsAuth(2);
                String sex = identity.substring(16, 17); //取指定位置的值(16位之后,17位结束;)
                int b = Integer.parseInt(sex);//强制类型转换
                if (b % 2 == 0) {
@@ -145,11 +146,11 @@
            applyService.insert(apply);
            Map<String,Object> reMap=new HashMap<>();
            reMap.put("auditState", aBoolean);
            return ApiJson.returnOK(reMap);
            return ResultUtil.success(reMap);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -164,7 +165,7 @@
    public Object authentication(Integer userId,String headImg) {
//        try {
//            if (userId == null || userId == 0) {
//                return ApiJson.returnNG("userId不能为空");
//                return ResultUtil.paranErr("userId不能为空");
//            }
//            /*查询实名认证信息*/
//            UserApply apply=applyService.selectOne(new EntityWrapper<UserApply>().eq("userId",userId)
@@ -202,7 +203,7 @@
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
        return ApiJson.returnNG("异常");
        return ResultUtil.paranErr("异常");
    }

    /**
@@ -214,12 +215,12 @@
    @ApiOperation(value = "获取车辆品牌列表", httpMethod = "GET")
    public Object getBrandList(){
        try {
            List<Brand> brands=brandService.selectList(null);
            return ApiJson.returnOK(brands);
            List<TCarBrand> tCarBrands = carBrandService.selectList(null);
            return ApiJson.returnOK(tCarBrands);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -238,10 +239,10 @@
    public Object homeOrderCount(Integer userId,Integer type){
        try {
            if(ToolUtil.isEmpty(userId)){
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            Integer count=0;

@@ -260,7 +261,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("获取异常");
        return ResultUtil.error("获取异常");
    }

    /**
@@ -279,10 +280,10 @@
    public Object homeOrderList(Integer userId,Integer type,Integer current,Integer size){
        try {
            if(ToolUtil.isEmpty(userId)){
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            List<OrderRideVo> rideVoList=new ArrayList<>();
            OrderRideVo orderRideVo=new OrderRideVo();
@@ -305,7 +306,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("获取异常");
        return ResultUtil.error("获取异常");
    }

    /**
@@ -366,7 +367,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("获取异常");
        return ResultUtil.error("获取异常");
    }

    /**
@@ -401,22 +402,22 @@
                           String endName,Double money,Integer isDai,String lxPhone){
        try {
            if(ToolUtil.isEmpty(userId)){
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            if(ToolUtil.isEmpty(startTime)){
                return ApiJson.returnNG("startTime不能为空");
                return ResultUtil.paranErr("startTime不能为空");
            }
            if(ToolUtil.isEmpty(num)){
                return ApiJson.returnNG("num不能为空");
                return ResultUtil.paranErr("num不能为空");
            }
            if(ToolUtil.isEmpty(startName)){
                return ApiJson.returnNG("startName不能为空");
                return ResultUtil.paranErr("startName不能为空");
            }
            if(ToolUtil.isEmpty(endName)){
                return ApiJson.returnNG("endName不能为空");
                return ResultUtil.paranErr("endName不能为空");
            }
            if(ToolUtil.isEmpty(money)){
                return ApiJson.returnNG("money不能为空");
                return ResultUtil.paranErr("money不能为空");
            }
            /*用户只能发布一个进行中的行程*/
            /*EntityWrapper<OrderRide> entityWrapper=new EntityWrapper();
@@ -424,7 +425,7 @@
            entityWrapper.in("state","1,2,3,4");
            Integer count=orderRideService.selectCount(entityWrapper);
            if(count>0){
                return ApiJson.returnNG("还有进行中的订单");
                return ResultUtil.paranErr("还有进行中的订单");
            }*/
            /*用户可以发布多个订单*/
            ParamRide paramRide=paramRideService.selectOne(new EntityWrapper<ParamRide>().eq("type",2));
@@ -455,15 +456,9 @@
            orderRide.setState(1);//未支付状态
            orderRideService.insert(orderRide);
            //todo 定时人数  自动取消订单
            Param param = paramService.selectOne(new EntityWrapper<Param>().eq("type", 21));//顺风车支付倒计时设置(分钟)
            Integer time =10;
            Map<String,Object> reMap=new HashMap<>();
            if(param != null){
                time=Integer.parseInt(param.getContext());
                reMap.put("djs",time);
            }else{
                reMap.put("djs",time);
            }
            reMap.put("djs",time);
            reMap.put("orderId",orderRide.getId());
            reMap.put("addTime",orderRide.getAddTime());
            // 添加定时任务信息
@@ -479,11 +474,11 @@
            maps.put("orderId",orderRide.getId());
            maps.put("timeTaskId",timeTask.getId());
            QuartzManager.addJob(CourseExamineRide.class,(CourseExamineRide.DSCE+orderRide.getId()).toUpperCase(), TimeJobType.UNLOCK, DateUtil.getDate_strYMdHms(System.currentTimeMillis() + 1000*60*time) , maps);
            return ApiJson.returnOK(orderRide.getId());
            return ResultUtil.success(orderRide.getId());
        } catch (Exception e) {
            e.printStackTrace();
        }
            return ApiJson.returnNG("异常");
            return ResultUtil.error("异常");
        }

    /**
@@ -512,19 +507,19 @@
    public Object driverAddTravel(Integer driverId,String startTime,Integer num,String startName,String endName,Double startLat,Double startLon,Double endLat,Double endLon){
        try {
            if(ToolUtil.isEmpty(driverId)){
                return ApiJson.returnNG("driverId不能为空");
                return ResultUtil.paranErr("driverId不能为空");
            }
            if(ToolUtil.isEmpty(startTime)){
                return ApiJson.returnNG("startTime不能为空");
                return ResultUtil.paranErr("startTime不能为空");
            }
            if(ToolUtil.isEmpty(num)){
                return ApiJson.returnNG("num不能为空");
                return ResultUtil.paranErr("num不能为空");
            }
            if(ToolUtil.isEmpty(startName)){
                return ApiJson.returnNG("startName不能为空");
                return ResultUtil.paranErr("startName不能为空");
            }
            if(ToolUtil.isEmpty(endName)){
                return ApiJson.returnNG("endName不能为空");
                return ResultUtil.paranErr("endName不能为空");
            }
            /*用户的资料过期了不可以发布行程*/
            DriverRide driverRide=driverRideService.selectById(driverId);
@@ -535,7 +530,7 @@
                            || DateUtil.getDate(driverRide.getDutyInsuranceTime(), "yyyy-MM-dd").getTime()-new Date().getTime()<0
                            || DateUtil.getDate(driverRide.getAnnualInspectionTime(), "yyyy-MM-dd").getTime()-new Date().getTime()<0
                            ){
                        return ApiJson.returnNG("您的证件已过期,请重新上传资料");
                        return ResultUtil.error("您的证件已过期,请重新上传资料");
                    }
                }
                /*1一个司机可以创建多个行程*/
@@ -560,7 +555,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }


@@ -607,46 +602,46 @@
                              String businessInsuranceTime,String businessInsuranceImg,String dutyInsuranceTime,String dutyInsuranceImg,String annualInspectionTime,String annualInspectionImg){
        try {
            if(ToolUtil.isEmpty(userId)){
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            if(ToolUtil.isEmpty(carType)){
                return ApiJson.returnNG("carType不能为空");
                return ResultUtil.paranErr("carType不能为空");
            }
            if(ToolUtil.isEmpty(brandId)){
                return ApiJson.returnNG("brandId不能为空");
                return ResultUtil.paranErr("brandId不能为空");
            }
            if(ToolUtil.isEmpty(carNum)){
                return ApiJson.returnNG("carNum不能为空");
                return ResultUtil.paranErr("carNum不能为空");
            }
            if(ToolUtil.isEmpty(license)){
                return ApiJson.returnNG("license不能为空");
                return ResultUtil.paranErr("license不能为空");
            }
            if(ToolUtil.isEmpty(licenseImg)){
                return ApiJson.returnNG("licenseImg不能为空");
                return ResultUtil.paranErr("licenseImg不能为空");
            }
            if(ToolUtil.isEmpty(comInsuranceTime)){
                return ApiJson.returnNG("comInsuranceTime不能为空");
                return ResultUtil.paranErr("comInsuranceTime不能为空");
            }
            if(ToolUtil.isEmpty(comInsuranceImg)){
                return ApiJson.returnNG("comInsuranceImg不能为空");
                return ResultUtil.paranErr("comInsuranceImg不能为空");
            }
            if(ToolUtil.isEmpty(businessInsuranceTime)){
                return ApiJson.returnNG("businessInsuranceTime不能为空");
                return ResultUtil.paranErr("businessInsuranceTime不能为空");
            }
            if(ToolUtil.isEmpty(businessInsuranceImg)){
                return ApiJson.returnNG("businessInsuranceImg不能为空");
                return ResultUtil.paranErr("businessInsuranceImg不能为空");
            }
            if(ToolUtil.isEmpty(dutyInsuranceTime)){
                return ApiJson.returnNG("dutyInsuranceTime不能为空");
                return ResultUtil.paranErr("dutyInsuranceTime不能为空");
            }
            if(ToolUtil.isEmpty(dutyInsuranceImg)){
                return ApiJson.returnNG("dutyInsuranceImg不能为空");
                return ResultUtil.paranErr("dutyInsuranceImg不能为空");
            }
            if(ToolUtil.isEmpty(annualInspectionTime)){
                return ApiJson.returnNG("annualInspectionTime不能为空");
                return ResultUtil.paranErr("annualInspectionTime不能为空");
            }
            if(ToolUtil.isEmpty(annualInspectionImg)){
                return ApiJson.returnNG("annualInspectionImg不能为空");
                return ResultUtil.paranErr("annualInspectionImg不能为空");
            }
            DriverRide driverRide=new DriverRide();
            driverRide.setBrandId(brandId);
@@ -710,7 +705,7 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -724,19 +719,19 @@
    public Object driverInfo(Integer driverId){
        try {
            if(ToolUtil.isEmpty(driverId)){
                return ApiJson.returnNG("driverId不能为空");
                return ResultUtil.paranErr("driverId不能为空");
            }
            DriverRide driverRide=driverRideService.selectById(driverId);
            /*获取司机品牌id*/
            Brand b=brandService.selectById(driverRide.getBrandId());
            if(b!=null){
                driverRide.setCarType(b.getName());
            TCarBrand tCarBrand = carBrandService.selectById(driverRide.getBrandId());
            if(tCarBrand!=null){
                driverRide.setCarType(tCarBrand.getName());
            }
            return ApiJson.returnOK(driverRide);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -755,10 +750,10 @@
    public Object cancelServiceMoney(Integer orderId,Integer type){
        try {
            if(ToolUtil.isEmpty(orderId)){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            Double serviceMoney=0d;
            if(type==1){//用户
@@ -800,11 +795,11 @@
                }
                orderTravelService.updateById(orderTravel);//更新取消服务费
            }
            return ApiJson.returnOK(serviceMoney);
            return ResultUtil.success(serviceMoney);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -819,14 +814,14 @@
    public Object userCancel(Integer orderId){
        try {
            if(ToolUtil.isEmpty(orderId)){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            /*查看这个订单是否在进行中*/
            OrderRide orderRide=orderRideService.selectById(orderId);
            if(orderRide!=null){
                /*查询该订单是否已经取消*/
                if(orderRide.getState()==6){
                    return ApiJson.returnNG("该订单已取消");
                    return ResultUtil.error("该订单已取消");
                }
                //用户取消给司机推送
                if(orderRide.getDriverId()!=null) {
@@ -844,11 +839,11 @@
                    orderTravelService.updateById(orderTravel);
                }
            }
            return ApiJson.returnOK("");
            return ResultUtil.success("");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }
    //用户取消退款
    public void userCancelTuik(OrderRide orderRide){
@@ -905,12 +900,12 @@
    public Object driverCancel(Integer orderId){
        try {
            if(ToolUtil.isEmpty(orderId)){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            OrderTravel orderTravel=orderTravelService.selectById(orderId);
            if(orderTravel!=null){
                if(orderTravel.getState()==6){
                    return ApiJson.returnNG("该订单已取消");
                    return ResultUtil.error("该订单已取消");
                }
                DriverRide driverRide=driverRideService.selectById(orderTravel.getDriverId());
                if(orderTravel.getServiceMoney()!=null && orderTravel.getServiceMoney()>0){
@@ -961,11 +956,11 @@
                }
            }

            return ApiJson.returnOK("");
            return ResultUtil.success("");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -986,10 +981,10 @@
    public Object driverOperation(Integer userOrderId,Integer type,Integer driverOrderId){
        try {
            if(ToolUtil.isEmpty(driverOrderId)){
                return ApiJson.returnNG("driverOrderId不能为空");
                return ResultUtil.paranErr("driverOrderId不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            OrderTravel orderTravel=orderTravelService.selectById(driverOrderId);//司机行程
            /*用户的资料过期了不可以发布行程*/
@@ -1000,17 +995,17 @@
                        || DateUtil.getDate(driverRide.getDutyInsuranceTime(), "yyyy-MM-dd").getTime()-new Date().getTime()<0
                        || DateUtil.getDate(driverRide.getAnnualInspectionTime(), "yyyy-MM-dd").getTime()-new Date().getTime()<0
                        ){
                    return ApiJson.returnNG("您的证件已过期,请重新上传资料");
                    return ResultUtil.error("您的证件已过期,请重新上传资料");
                }
            }
            OrderRide orderRide=orderRideService.selectById(userOrderId);
            if(orderRide!=null && orderRide.getState()==6){
                return  ApiJson.returnNG("用户已取消该行程");
                return  ResultUtil.error("用户已取消该行程");
            }
            if(orderTravel!=null){
                if(type==1){//1确认同行 一个行程只能匹配一个订单
                    if(orderTravel.getState()==3){
                        return ApiJson.returnNG("该行程已经绑定了用户订单");
                        return ResultUtil.error("该行程已经绑定了用户订单");
                    }
                    orderTravel.setState(3);
                    //绑定司机行程、设置用户订单状态
@@ -1045,11 +1040,7 @@
                    if(ToolUtil.isNotEmpty(driverRide.getByInviteCode())){
                        /*计算推广用户的提成*/
                        UserInfo userInfo1=userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("inviteCodeRide",driverRide.getByInviteCode()));
                        Param param=paramService.selectOne(new EntityWrapper<Param>().eq("type",22));
                        Double discount=100d;
                        if(param!=null){
                            discount=Double.valueOf(param.getContext());
                        }
                        Double money=orderRide.getMoney()*discount/100;//提成金额
                        userInfoService.updateById(userInfo1);
                        
@@ -1079,11 +1070,11 @@
                }
            }
            pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, orderRide.getState(), null);
            return ApiJson.returnOK("");
            return ResultUtil.success("");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }
    /**
     * 用户评价
@@ -1107,16 +1098,16 @@
    public Object evaluate(Integer orderId,Integer driverId,Integer userId,Integer score,String  content){
        try {
            if(userId == null || userId == 0){
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            if(driverId == null || driverId == 0){
                return ApiJson.returnNG("driverId不能为空");
                return ResultUtil.paranErr("driverId不能为空");
            }
            if(orderId == null || orderId == 0){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            if(score == null || score == 0){
                return ApiJson.returnNG("score不能为空");
                return ResultUtil.paranErr("score不能为空");
            }
            Evaluate evaluate=new Evaluate();
            evaluate.setAddTime(new Date());
@@ -1134,7 +1125,7 @@
                SensitiveWordUtil.init(sensitiveWordSet);
                boolean result = SensitiveWordUtil.contains(content);
                if(result){
                    return ApiJson.returnNG("评价内容包含敏感词");
                    return ResultUtil.error("评价内容包含敏感词");
                }
            }
            evaluate.setContent(content);
@@ -1161,11 +1152,11 @@
            orderRideService.updateById(orderTaxi);
            evaluateService.insert(evaluate);
            /*需要反订单数据*/
            return ApiJson.returnOK(orderId);
            return ResultUtil.success(orderId);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("");
        return ResultUtil.error("");
    }

    /**
@@ -1191,13 +1182,13 @@
    public Object complaints(Integer driverId,Integer userId,String  content,String reMark,Integer type,Integer orderId) {
        try {
            if (userId == null || userId == 0) {
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            if (driverId == null || driverId == 0) {
                return ApiJson.returnNG("driverId不能为空");
                return ResultUtil.paranErr("driverId不能为空");
            }
            if (orderId == null || orderId == 0) {
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            Complaints complaints=new Complaints();
            complaints.setAddTime(new Date());
@@ -1212,7 +1203,7 @@
            SensitiveWordUtil.init(sensitiveWordSet);
            boolean result = SensitiveWordUtil.contains(content);
            if(result){
                return ApiJson.returnNG("投诉内容包含敏感词");
                return ResultUtil.error("投诉内容包含敏感词");
            }
            complaints.setContent(content);
            complaints.setReMark(reMark);
@@ -1240,11 +1231,11 @@
                orderTravel.setIsComplaint(2);
                orderTravelService.updateById(orderTravel);
            }
            return ApiJson.returnOK("投诉成功");
            return ResultUtil.success("投诉成功");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("");
        return ResultUtil.error("");
    }
    /**
     *  用户邀请司机接单（需要发送消息）
@@ -1262,10 +1253,10 @@
    public Object myOrders(Integer orderId,Integer userId){
        try {
            if(ToolUtil.isEmpty(orderId)){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            if(ToolUtil.isEmpty(userId)){
                return ApiJson.returnNG("userId不能为空");
                return ResultUtil.paranErr("userId不能为空");
            }
            OrderTravel orderTravel=orderTravelService.selectById(orderId);
            UserInfo userInfo_=userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("driverId",orderTravel.getDriverId()));//司机用户
@@ -1280,11 +1271,11 @@
                    throw new RuntimeException(e);
                }
            }
            return ApiJson.returnOK("邀请成功");
            return ResultUtil.success("邀请成功");
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }
    /**
     * 用户订单匹配列表页面，用户订单去匹配司机的行程
@@ -1299,23 +1290,15 @@
    @ApiOperation(value = "用户订单匹配列表页面，用户订单去匹配司机的行程", httpMethod = "POST")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int"),
            @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近", dataType = "int"),
            @ApiImplicitParam(name = "lon", value = "经度", dataType = "double"),
            @ApiImplicitParam(name = "lat", value = "纬度", dataType = "double"),
            @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近", dataType = "int")
    })
    public Object userMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type,Double lon,Double lat){
    public Object userMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type){
        try {
            if(ToolUtil.isEmpty(orderId)){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
            }
            if(ToolUtil.isEmpty(lon)){
                return ApiJson.returnNG("lon不能为空");
            }
            if(ToolUtil.isEmpty(lat)){
                return ApiJson.returnNG("lat不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            OrderRide orderRide=orderRideService.selectById(orderId);
            current=current==null?1:current;
@@ -1325,16 +1308,16 @@
            OrderRideVo orderRideVo=new OrderRideVo();
            orderRideVo.setCurrent(current);
            orderRideVo.setSize(size);
            orderRideVo.setLon(lon);
            orderRideVo.setLat(lat);
            orderRideVo.setLon(orderRide.getStartLon());
            orderRideVo.setLat(orderRide.getStartLat());
            orderRideVo.setNum(orderRide.getNum());
            orderRideVo.setType(type+1);//搜索条件：1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近
            List<OrderRideVo> orderRides=orderTravelService.getOrderTravel(orderRideVo);
            return ApiJson.returnOK(orderRides);
            return ResultUtil.success(orderRides);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -1352,24 +1335,16 @@
    @ApiOperation(value = "司机订单匹配列表页面(司机的订单去匹配乘客订单)", httpMethod = "POST")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int"),
            @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近，4价格最低", dataType = "int"),
            @ApiImplicitParam(name = "lon", value = "经度", dataType = "double"),
            @ApiImplicitParam(name = "lat", value = "纬度", dataType = "double"),
            @ApiImplicitParam(name = "type", value = "1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近，4价格最低", dataType = "int")
    })
    public Object driverMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type,Double lon,Double lat){
    public Object driverMatchingOrderList(Integer orderId,Integer current,Integer size,Integer type){
        try {
            try {
                if(ToolUtil.isEmpty(orderId)){
                    return ApiJson.returnNG("orderId不能为空");
                    return ResultUtil.paranErr("orderId不能为空");
                }
                if(ToolUtil.isEmpty(type)){
                    return ApiJson.returnNG("type不能为空");
                }
                if(ToolUtil.isEmpty(lon)){
                    return ApiJson.returnNG("lon不能为空");
                }
                if(ToolUtil.isEmpty(lat)){
                    return ApiJson.returnNG("lat不能为空");
                    return ResultUtil.paranErr("type不能为空");
                }
                OrderTravel orderTravel=orderTravelService.selectById(orderId);
                current=current==null?1:current;
@@ -1380,18 +1355,18 @@
                orderRideVo.setCurrent(current);
                orderRideVo.setSize(size);
                orderRideVo.setNum(orderTravel.getNum());
                orderRideVo.setLon(lon);
                orderRideVo.setLat(lat);
                orderRideVo.setLon(orderTravel.getStartLon());
                orderRideVo.setLat(orderTravel.getStartLat());
                orderRideVo.setType(type+1);//搜索条件：1默认排序（根据线路、时间，人数综合匹配排序721），2时间最早，3距离最近，4价格最低
                List<OrderRideVo> orderRides=orderRideService.getOrderRide(orderRideVo);
                return ApiJson.returnOK(orderRides);
                return ResultUtil.success(orderRides);
            } catch (Exception e) {
                e.printStackTrace();
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -1412,10 +1387,10 @@
    public Object orderInfo(Integer orderId,Integer type,Double lon,Double lat) {
        try {
            if(ToolUtil.isEmpty(orderId)){
                return ApiJson.returnNG("orderId不能为空");
                return ResultUtil.paranErr("orderId不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            //取司机的经纬度
            OrderRideInfoVo orderRideInfoVo=new OrderRideInfoVo();
@@ -1429,19 +1404,13 @@
                orderRideInfoVo=orderTravelService.getOrderInfo(orderRideInfoVo);
            }
            /*获取顺风车订单支付倒计时*/
            Param param = paramService.selectOne(new EntityWrapper<Param>().eq("type", 21));//顺风车支付倒计时设置(分钟)
            Integer time =10;
            if(param != null){
                time=Integer.parseInt(param.getContext());
                orderRideInfoVo.setDjs(time);
            }else{
                orderRideInfoVo.setDjs(time);
            }
            return ApiJson.returnOK(orderRideInfoVo);
            orderRideInfoVo.setDjs(time);
            return ResultUtil.success(orderRideInfoVo);
            } catch (Exception e) {
                e.printStackTrace();
            }
            return ApiJson.returnNG("异常");
            return ResultUtil.error("异常");
        }

    /**
@@ -1456,10 +1425,10 @@
    public Object orderInfo(String inviteCode,Integer type) {
        try {
            if(ToolUtil.isEmpty(inviteCode)){
                return ApiJson.returnNG("inviteCode不能为空");
                return ResultUtil.paranErr("inviteCode不能为空");
            }
            if(ToolUtil.isEmpty(type)){
                return ApiJson.returnNG("type不能为空");
                return ResultUtil.paranErr("type不能为空");
            }
            Integer count=0;
            if(type==1){
@@ -1467,11 +1436,11 @@
            }else {
                count=userInfoService.selectCount(new EntityWrapper<UserInfo>().eq("inviteCodeRide",inviteCode));
            }
            return ApiJson.returnOK(count);
            return ResultUtil.success(count);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

    /**
@@ -1486,7 +1455,7 @@
    public Object orderInfo(Integer driverId) {
        try {
            if(ToolUtil.isEmpty(driverId)){
                return ApiJson.returnNG("driverId不能为空");
                return ResultUtil.paranErr("driverId不能为空");
            }
            DriverRide driverRide=driverRideService.selectById(driverId);
            Integer count=0;
@@ -1499,11 +1468,11 @@
                    count=1;
                }
            }
            return ApiJson.returnOK(count);
            return ResultUtil.success(count);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return ApiJson.returnNG("异常");
        return ResultUtil.error("异常");
    }

}