From 2b3cf8e87398099ba0818ea84e6c751871beac1c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 28 Jun 2021 20:53:10 +0800 Subject: [PATCH] modify --- gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java index 18cb88e..8080976 100644 --- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java +++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java @@ -7,13 +7,16 @@ import com.xzx.gc.order.dto.AddJhyOrderDto; import com.xzx.gc.order.dto.JhyOrderListDto; import com.xzx.gc.order.service.JhyOrderService; +import com.xzx.gc.order.vo.JhyOrderDetailsVo; import com.xzx.gc.order.vo.JhyOrderListVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -47,5 +50,33 @@ return JsonResult.success(result); } + @ApiOperation("订单明细信息") + @ApiResponses( + @ApiResponse(code = 200, message = "success", response = JhyOrderDetailsVo.class) + ) + @PostMapping(value = "/jhy/order/details/{orderId}") + public JsonResult<Object> orderDetail(@PathVariable("orderId") Long orderId, HttpServletRequest request) { + return JsonResult.success(jhyOrderService.orderDetails(orderId, getUserId(request))); + } + + @ApiOperation("抢单") + @PostMapping(value = "/jhy/order/grab/{orderId}") + public Result<String> grabOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) { + jhyOrderService.grabOrder(orderId, getUserId(request)); + return Result.success(); + } + + @ApiOperation("取消订单") + @PostMapping(value = "/jhy/order/cancel/{orderId}") + public Result<String> cancelOrder(Long orderId, HttpServletRequest request) { + jhyOrderService.cancelOrder(orderId, getUserId(request)); + return null; + } + + @ApiOperation("确认订单-支付") + @PostMapping(value = "/jhy/order/confirm") + public Result<String> confirmOrder() { + return null; + } } -- Gitblit v1.9.1