From e41f83ce93b31c3d2ed416a8b45dc493177e6dd8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 May 2021 17:51:57 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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..f996c80 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
@@ -1,13 +1,12 @@
package com.xcong.excoin.modules.yunding.controller;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.yunding.dto.InsureChangeUsdtDto;
import com.xcong.excoin.modules.yunding.dto.PayProductDto;
import com.xcong.excoin.modules.yunding.dto.YdOrderListDto;
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.YdOrderVo;
-import com.xcong.excoin.modules.yunding.vo.YdProductVo;
+import com.xcong.excoin.modules.yunding.vo.*;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -28,6 +27,9 @@
* 全网数据
*/
@ApiOperation(value = "全网数据")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = YdBasicSettingVo.class)
+ })
@GetMapping(value = "/findAllInfo")
public Result findAllInfo() {
return yunDingService.findAllInfo();
@@ -86,6 +88,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 = "订单头部数据")
@@ -97,6 +112,26 @@
return yunDingService.findOrderAllInfo();
}
+ /**
+ * 转换成USDT
+ */
+ @ApiOperation(value = "获取转换成USDT信息")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = ChangeVo.class)
+ })
+ @GetMapping(value = "/changeUsdt")
+ public Result changeUsdt() {
+ return yunDingService.changeUsdt();
+ }
+
+ /**
+ * 确认转换成USDT
+ */
+ @ApiOperation(value = "确认转换成USDT")
+ @PostMapping(value = "/insureChangeUsdt")
+ public Result insureChangeUsdt(@RequestBody @Validated InsureChangeUsdtDto insureChangeUsdtdto){
+ return yunDingService.insureChangeUsdt(insureChangeUsdtdto);
+ }
}
--
Gitblit v1.9.1