From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index 132e8a4..8b0bc8d 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -6,6 +6,7 @@
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
+import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import com.supersavedriving.driver.modular.system.warpper.ResponseWarpper;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -171,7 +172,16 @@
- public ResponseWarpper<> queryOrderInfo(Long orderId, HttpServletRequest request){
+
+ @ResponseBody
+ @PostMapping("/api/order/queryOrderInfo")
+ @ServiceLog(name = "获取订单详情", url = "/api/order/queryOrderInfo")
+ @ApiOperation(value = "获取订单详情", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "long"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<OrderInfoWarpper> queryOrderInfo(Long orderId, HttpServletRequest request){
if(null == orderId){
return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
}
@@ -180,12 +190,28 @@
if(null == uid){
return ResponseWarpper.success(ResultUtil.tokenErr());
}
- ResultUtil resultUtil = orderService.receiveOrder(uid, orderId);
- return ResponseWarpper.success(resultUtil);
+ OrderInfoWarpper orderInfoWarpper = orderService.queryOrderInfo(uid, orderId);
+ return ResponseWarpper.success(orderInfoWarpper);
}catch (Exception e){
e.printStackTrace();
return new ResponseWarpper(500, e.getMessage());
}
}
+
+
+ public ResponseWarpper driverProcessOperations(Long orderId, Integer state, HttpServletRequest request){
+ if(null == orderId){
+ return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
+ }
+ if(null == state){
+ return ResponseWarpper.success(ResultUtil.paranErr("state"));
+ }
+ try {
+
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
}
--
Gitblit v1.7.1