From 6ec40dc71bdce4dd21ee8c6436a43b7fc20c422c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 May 2021 14:34:00 +0800
Subject: [PATCH] conflect
---
src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java b/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java
index 9c5568f..a3a1d29 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java
@@ -6,6 +6,7 @@
import com.xcong.excoin.modules.yunding.dto.YdProductListDto;
import com.xcong.excoin.modules.yunding.service.YunDingService;
import com.xcong.excoin.modules.yunding.vo.OrderAllInfoVo;
+import com.xcong.excoin.modules.yunding.vo.YdBasicSettingVo;
import com.xcong.excoin.modules.yunding.vo.YdOrderVo;
import com.xcong.excoin.modules.yunding.vo.YdProductVo;
import io.swagger.annotations.*;
@@ -28,6 +29,9 @@
* 全网数据
*/
@ApiOperation(value = "全网数据")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = YdBasicSettingVo.class)
+ })
@GetMapping(value = "/findAllInfo")
public Result findAllInfo() {
return yunDingService.findAllInfo();
@@ -86,6 +90,19 @@
}
/**
+ * 订单详情
+ */
+ @ApiOperation(value = "订单详情")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = YdOrderVo.class)
+ })
+ @GetMapping(value = "/getOrderInfo")
+ public Result getOrderInfo(@ApiParam(name = "id", value = "订单ID", required = true, example = "1")
+ @RequestParam(value = "id") Long id) {
+ return yunDingService.getOrderInfo(id);
+ }
+
+ /**
*订单头部数据
*/
@ApiOperation(value = "订单头部数据")
--
Gitblit v1.9.1