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 | 137 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 137 insertions(+), 0 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 a7a423d..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
@@ -5,6 +5,8 @@
import com.supersavedriving.driver.modular.system.service.IOrderService;
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;
@@ -16,6 +18,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* 订单控制器
@@ -57,6 +60,7 @@
}
+
@ResponseBody
@PostMapping("/api/order/driverAddOrder")
@ServiceLog(name = "司机代客下单", url = "/api/order/driverAddOrder")
@@ -77,4 +81,137 @@
return new ResponseWarpper(500, e.getMessage());
}
}
+
+
+
+ @ResponseBody
+ @PostMapping("/api/order/queryOrderHall")
+ @ServiceLog(name = "司机获取大厅订单列表", url = "/api/order/queryOrderHall")
+ @ApiOperation(value = "司机获取大厅订单列表", tags = {"司机端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper<List<HallOrderList>> queryOrderHall(Integer pageNum, Integer pageSize, HttpServletRequest request){
+ if(null == pageNum){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
+ }
+ if(null == pageSize){
+ return ResponseWarpper.success(ResultUtil.paranErr("pageSize"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequset(request);
+ if(null == uid){
+ return ResponseWarpper.success(ResultUtil.tokenErr());
+ }
+ List<HallOrderList> hallOrderLists = orderService.queryOrderHall(uid, pageNum, pageSize);
+ return ResponseWarpper.success(hallOrderLists);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/order/rejectionOrder")
+ @ServiceLog(name = "司机拒绝接单", url = "/api/order/rejectionOrder")
+ @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 rejectionOrder(Long orderId, HttpServletRequest request){
+ if(null == orderId){
+ return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequset(request);
+ if(null == uid){
+ return ResponseWarpper.success(ResultUtil.tokenErr());
+ }
+ ResultUtil resultUtil = orderService.rejectionOrder(uid, orderId);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/order/receiveOrder")
+ @ServiceLog(name = "司机接单操作", url = "/api/order/receiveOrder")
+ @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 receiveOrder(Long orderId, HttpServletRequest request){
+ if(null == orderId){
+ return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequset(request);
+ if(null == uid){
+ return ResponseWarpper.success(ResultUtil.tokenErr());
+ }
+ ResultUtil resultUtil = orderService.receiveOrder(uid, orderId);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
+ @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"));
+ }
+ try {
+ Integer uid = driverService.getUserByRequset(request);
+ if(null == uid){
+ return ResponseWarpper.success(ResultUtil.tokenErr());
+ }
+ 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