From f69fd42a3ae2d11713dcd284ae3db57e449ae6dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 18:00:45 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 8080976..91f6e7a 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;
@@ -68,15 +69,17 @@
@ApiOperation("取消订单")
@PostMapping(value = "/jhy/order/cancel/{orderId}")
- public Result<String> cancelOrder(Long orderId, HttpServletRequest request) {
+ 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() {
- return null;
+ public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto, HttpServletRequest request) {
+ confirmDto.setUserId(getUserId(request));
+ jhyOrderService.confirmOrder(confirmDto);
+ return Result.success();
}
}
--
Gitblit v1.9.1