From c4d8357ad30bb39968279957d1fb594ef8dfdf5f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:09:56 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 ac46420..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
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
@Slf4j
@RestController
@@ -71,13 +72,21 @@
@PostMapping(value = "/jhy/order/cancel/{orderId}")
public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
jhyOrderService.cancelOrder(orderId, getUserId(request));
- return null;
+ return Result.success();
}
@ApiOperation("确认订单-支付")
@PostMapping(value = "/jhy/order/confirm")
- public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto) {
- return null;
+ 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