| | |
| | | /** |
| | | * 获取首页信息 |
| | | */ |
| | | // @ApiOperation(value = "司机端-订单列表--in progress",notes="司机端-订单列表--in progress") |
| | | // @ApiImplicitParams({ |
| | | // @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), |
| | | // @ApiImplicitParam(name = "id", value = "司机id", required = true, dataType = "int"), |
| | | // @ApiImplicitParam(name = "containerNo", value = "货柜号", required = false, dataType = "String"), |
| | | // @ApiImplicitParam(name = "date", value = "时间 2000-01-01", required = false, dataType = "String"), |
| | | // @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int"), |
| | | // @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int"), |
| | | // @ApiImplicitParam(name = "type", value = "1 in progree 2 wancheng", required = true, dataType = "int"), |
| | | // }) |
| | | // @GetMapping(value = "/index") |
| | | // @ResponseBody |
| | | // public Object list(int id,String containerNo,String date,int pageNumber,int pageSize,int type) { |
| | | // Page<OrderInfoVo> orderInfoVoPage = new Page<>(pageNumber, pageSize); |
| | | // String sTime = null; |
| | | // String eTime =null; |
| | | // if(ToolUtil.isNotEmpty(date)){ |
| | | // sTime=date+" 00:00:01"; |
| | | // eTime=date+" 23:59:59"; |
| | | // } |
| | | // List<OrderInfoVo> list = orderService.getOrderListIndex(orderInfoVoPage,id,containerNo,sTime,eTime,type); |
| | | // return new SuccessTip(list); |
| | | // } |
| | | |
| | | |
| | | @ApiOperation(value = "司机端-订单列表--in progress",notes="司机端-订单列表--in progress") |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), |
| | |
| | | @ApiImplicitParams({ |
| | | @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), |
| | | @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "Long"), |
| | | @ApiImplicitParam(name = "type", value = "传回来的type", required = true, dataType = "int"), |
| | | @ApiImplicitParam(name = "driverId", value = "司机id", required = true, dataType = "int"), |
| | | }) |
| | | @GetMapping(value = "/orderInfo") |
| | | @ResponseBody |
| | | public Object orderInfo(Long id,Integer type) { |
| | | OrderDetailVo orderDetailVo = orderService.orderInfo(id,type); |
| | | public Object orderInfo(Long id,int driverId) { |
| | | OrderDetailVo orderDetailVo = orderService.orderInfo(id,driverId); |
| | | // 经纬度给上 |
| | | return new SuccessTip(orderDetailVo); |
| | | } |