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 | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 bcac137..9af4821 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -1,10 +1,7 @@
package cc.mrbird.febs.mall.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.mall.dto.AddOrderDto;
-import cc.mrbird.febs.mall.dto.AddRefundDto;
-import cc.mrbird.febs.mall.dto.OrderListDto;
-import cc.mrbird.febs.mall.dto.PayOrderDto;
+import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
@@ -53,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("支付成功");
}
@@ -89,13 +86,21 @@
@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 = "提交退款申请")
- @PostMapping(value = "/addRefund")
- public FebsResponse addRefund(@RequestBody AddRefundDto addRefundDto) {
- return null;
+ @PostMapping(value = "/applyRefund")
+ public FebsResponse applyRefund(@RequestBody AddRefundDto addRefundDto) {
+ mallOrderInfoService.applyRefund(addRefundDto);
+ return new FebsResponse().success().message("提交成功");
}
+ @ApiOperation(value = "提交退款物流信息", notes = "提交退款物流信息")
+ @PostMapping(value = "/refundExpress")
+ public FebsResponse refundExpress(@RequestBody RefundExpressDto refundExpressDto) {
+ mallOrderInfoService.refundExpress(refundExpressDto);
+ return new FebsResponse().success().message("提交成功");
+ }
}
--
Gitblit v1.9.1