From cad69fd8620d6317fe09efdd4eee730bf8e2d053 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 17:53:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 9d7ef92..282a9c7 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.AddOrderDto;
+import cc.mrbird.febs.mall.dto.OrderListDto;
import cc.mrbird.febs.mall.dto.PayOrderDto;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import io.swagger.annotations.Api;
@@ -55,4 +56,16 @@
return new FebsResponse().success().data(map).message("支付成功");
}
+ @ApiOperation(value = "订单列表", notes = "订单列表")
+ @PostMapping(value = "/orderList")
+ public FebsResponse orderList(@RequestBody OrderListDto orderListDto) {
+ return new FebsResponse().success().data(mallOrderInfoService.findOrderList(orderListDto));
+ }
+
+ @ApiOperation(value = "订单详情", notes = "订单详情")
+ @GetMapping(value = "/orderDetails/{id}")
+ public FebsResponse orderDetails(@PathVariable("id") Long id) {
+ return new FebsResponse().success().data(mallOrderInfoService.findOrderDetailsById(id));
+ }
+
}
--
Gitblit v1.9.1