From b2100bd0dd320e1a6e63c20d0b4bd46a6a333504 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 20 May 2022 11:19:11 +0800
Subject: [PATCH] 20220518
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
index d44f7d1..9af4821 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -50,10 +50,10 @@
@ApiOperation(value = "支付订单", notes = "支付订单")
@PostMapping(value = "/payOrder")
public FebsResponse payOrder(@RequestBody PayOrderDto payOrderDto) {
- String result = mallOrderInfoService.payOrder(payOrderDto);
+ Map<String, Object> result = mallOrderInfoService.payOrder(payOrderDto);
Map<String, Object> map = new HashMap<>();
- map.put("orderNo", result);
+ map.put("order", result);
map.put("type", payOrderDto.getType());
return new FebsResponse().success().data(map).message("支付成功");
}
@@ -86,7 +86,8 @@
@ApiOperation(value = "删除订单", notes = "删除订单")
@PostMapping(value = "/delOrder/{id}")
public FebsResponse delOrder(@PathVariable("id") Long id) {
- return null;
+ mallOrderInfoService.delOrder(id);
+ return new FebsResponse().success().message("删除成功");
}
@ApiOperation(value = "提交退款申请", notes = "提交退款申请")
--
Gitblit v1.9.1