From 6c1a535a157864b177c17aa14afcda9ad92a2a9b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Aug 2021 15:08:23 +0800
Subject: [PATCH] 20210825
---
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 6d6f5c9..cfc924f 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
@@ -5,6 +5,7 @@
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.order.dto.AddJhyOrderDto;
+import com.xzx.gc.order.dto.JhyOrderConfirmDto;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.service.JhyOrderService;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
@@ -14,6 +15,7 @@
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;
@@ -21,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
@Slf4j
@RestController
@@ -58,4 +61,32 @@
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(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+ jhyOrderService.cancelOrder(orderId, getUserId(request));
+ return Result.success();
+ }
+
+ @ApiOperation("确认订单-支付")
+ @PostMapping(value = "/jhy/order/confirm")
+ public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto, HttpServletRequest request) {
+ confirmDto.setUserId(getUserId(request));
+ jhyOrderService.confirmOrder(confirmDto);
+ return Result.success();
+ }
+
+ @ApiOperation("订单状态数量")
+ @PostMapping(value = "/jhy/order/orderStatusCnt/{type}")
+ public JsonResult<Map<Integer, Integer>> orderStatusCnt(@PathVariable("type") Integer type, HttpServletRequest request) {
+ return JsonResult.success(jhyOrderService.orderStatusCount(type, getUserId(request)));
+ }
+
}
--
Gitblit v1.9.1