From 31c11e345297f4f9938c7ea32d3864ed3ab26697 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 12:43:15 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 8 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 cd8fb00..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,16 +1,22 @@
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.*;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.vo.OrderDetailVo;
+import cc.mrbird.febs.mall.vo.OrderListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -26,18 +32,75 @@
private final IApiMallOrderInfoService mallOrderInfoService;
- @ApiOperation(value = "提交订单", notes = "提交订单")
- @PostMapping(value = "/addOrder")
- public FebsResponse addOrder(@RequestBody AddOrderDto addOrderDto) {
- String orderNo = mallOrderInfoService.createOrder(addOrderDto);
+ @ApiOperation(value = "创建订单", notes = "创建订单")
+ @PostMapping(value = "/createOrder")
+ public FebsResponse createOrder(@RequestBody AddOrderDto addOrderDto) {
+ Long orderId = mallOrderInfoService.createOrder(addOrderDto);
- // TODO 创建支付订单
- return new FebsResponse().success().message("创建订单成功");
+ return new FebsResponse().success().data(orderId).message("创建订单成功");
}
@ApiOperation(value = "取消订单", notes = "取消订单")
@PostMapping(value = "/cancelOrder/{id}")
public FebsResponse cancelOrder(@PathVariable("id") Long id) {
- return null;
+ mallOrderInfoService.cancelOrder(id);
+ return new FebsResponse().success();
+ }
+
+ @ApiOperation(value = "支付订单", notes = "支付订单")
+ @PostMapping(value = "/payOrder")
+ public FebsResponse payOrder(@RequestBody PayOrderDto payOrderDto) {
+ Map<String, Object> result = mallOrderInfoService.payOrder(payOrderDto);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("order", result);
+ map.put("type", payOrderDto.getType());
+ return new FebsResponse().success().data(map).message("支付成功");
+ }
+
+ @ApiOperation(value = "订单列表", notes = "订单列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = OrderListVo.class)
+ })
+ @PostMapping(value = "/orderList")
+ public FebsResponse orderList(@RequestBody OrderListDto orderListDto) {
+ return new FebsResponse().success().data(mallOrderInfoService.findOrderList(orderListDto));
+ }
+
+ @ApiOperation(value = "订单详情", notes = "订单详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = OrderDetailVo.class)
+ })
+ @GetMapping(value = "/orderDetails/{id}")
+ public FebsResponse orderDetails(@PathVariable("id") Long id) {
+ return new FebsResponse().success().data(mallOrderInfoService.findOrderDetailsById(id));
+ }
+
+ @ApiOperation(value = "确认收货", notes = "确认收货")
+ @PostMapping(value = "/confirm/{id}")
+ public FebsResponse confirm(@PathVariable("id") Long id) {
+ mallOrderInfoService.confirmOrder(id);
+ return new FebsResponse().success().message("确认成功");
+ }
+
+ @ApiOperation(value = "删除订单", notes = "删除订单")
+ @PostMapping(value = "/delOrder/{id}")
+ public FebsResponse delOrder(@PathVariable("id") Long id) {
+ mallOrderInfoService.delOrder(id);
+ return new FebsResponse().success().message("删除成功");
+ }
+
+ @ApiOperation(value = "提交退款申请", notes = "提交退款申请")
+ @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