From ab7cc0cb35f3375b35f7f3d866704d1383ddcff5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 14 九月 2022 11:18:34 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 57c3601..e670dbc 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -179,10 +179,10 @@
*/
@ResponseBody
@PostMapping("/api/order/queryPushOrder")
- @ApiOperation(value = "获取抢单界面的订单详情", tags = {"司机端-首页"}, notes = "")
+ @ApiOperation(value = "获取抢单界面的订单详情【1.0】", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，4=小件物流-同城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "当前定位经度", name = "lon", required = true, dataType = "string"),
@ApiImplicitParam(value = "当前定位纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -212,7 +212,7 @@
@ApiOperation(value = "司机抢单操作", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，4=小件物流-同城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil grabOrder(Integer orderId, Integer orderType, HttpServletRequest request){
@@ -239,14 +239,14 @@
@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=专车，4=小件物流-同城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType){
try {
Map<String, Object> map = orderService.queryOrderInfo(orderId, orderType);
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
- File file = new File(filePath + orderId + "_1.txt");
+ File file = new File(filePath + orderId + "_" + orderType + ".txt");
if(file.exists()){
//读取文件(字符流)
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
@@ -280,7 +280,7 @@
@ApiOperation(value = "获取改派支付金额", tags = {"司机端-服务中"}, notes = "返回金额为0不需要调用支付")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id（跨城多个订单使用逗号分隔）", name = "orderId", required = true, dataType = "string"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，4=小件物流-同城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<BaseWarpper> queryReassignMoney(String orderId, Integer orderType){
@@ -348,7 +348,7 @@
@ApiOperation(value = "司机走流程操作", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，4=小件物流-同城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）", name = "state", required = true, dataType = "int"),
@ApiImplicitParam(value = "手机号后四位", name = "phone", required = false, dataType = "String"),
@ApiImplicitParam(value = "当前经度", name = "lon", required = true, dataType = "double"),
--
Gitblit v1.7.1