From 898213bf34f8535b703a90bef799a9bf0adba95c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 14:41:28 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 8 +++++---
1 files changed, 5 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..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
@@ -71,13 +71,15 @@
@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();
}
}
--
Gitblit v1.9.1