From 1bb96c916d55452cd7951c48c008aa919331aceb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期二, 12 八月 2025 11:46:56 +0800 Subject: [PATCH] update --- DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java index 57f5b56..a459b45 100644 --- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java +++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java @@ -440,7 +440,7 @@ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,4=小件物流-同城,5=小件物流-跨城)", name = "orderType", required = true, dataType = "int"), @ApiImplicitParam(value = "改派支付方式(1=微信,2=支付宝,3=余额,4=云闪付)", name = "payType", required = false, dataType = "int"), - @ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"), + @ApiImplicitParam(value = "改派原因", name = "reason", required = false, dataType = "string"), @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) @@ -459,6 +459,33 @@ } } + @ResponseBody + @PostMapping("/api/order/reassignCancel") + @ApiOperation(value = "提交改派申请--取消", tags = {"司机端-服务中"}, notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"), + @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,4=小件物流-同城,5=小件物流-跨城)", name = "orderType", required = true, dataType = "int"), + @ApiImplicitParam(value = "改派支付方式(1=微信,2=支付宝,3=余额,4=云闪付)", name = "payType", required = false, dataType = "int"), + @ApiImplicitParam(value = "改派原因", name = "reason", required = false, dataType = "string"), + @ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"), + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") + }) + public ResultUtil reassignCancel(Reassign reassign, HttpServletRequest request){ + try { + Integer uid = driverService.getUserIdFormRedis(request); + if(null == uid){ + return ResultUtil.tokenErr(); + } + return reassignService.saveDataCancel(reassign, uid, null); + }catch (SystemException s){ + return ResultUtil.error(s.getMsg()); + } catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + /** * 司机走流程操作 -- Gitblit v1.7.1