From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
index cd02124..ae140b0 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.documentary.dto.OutFollowInfoDto;
import com.xcong.excoin.modules.documentary.dto.TradeFollowInfoDto;
import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;
import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
@@ -19,9 +20,12 @@
import com.xcong.excoin.modules.documentary.vo.TradeOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeProfitInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TradeSetLabelInfoVo;
import com.xcong.excoin.modules.documentary.vo.TraderStatusVo;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -61,7 +65,7 @@
*/
@ApiOperation(value="交易员设置--当前带单", notes="交易员设置--当前带单")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeOrderInfoVo.class)})
- @GetMapping(value = "/getTradeOrderInfo")
+ @PostMapping(value = "/getTradeOrderInfo")
public Result getTradeOrderInfo(@RequestBody @Valid TradeOrderInfoDto tradeOrderInfoDto) {
return documentaryService.getTradeOrderInfo(tradeOrderInfoDto);
}
@@ -71,7 +75,7 @@
*/
@ApiOperation(value="交易员设置--历史带单", notes="交易员设置--历史带单")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeHistoryOrderInfoVo.class)})
- @GetMapping(value = "/getTradeHistoryOrderInfo")
+ @PostMapping(value = "/getTradeHistoryOrderInfo")
public Result getTradeHistoryOrderInfo(@RequestBody @Valid TradeOrderInfoDto tradeOrderInfoDto) {
return documentaryService.getTradeHistoryOrderInfo(tradeOrderInfoDto);
}
@@ -81,9 +85,18 @@
*/
@ApiOperation(value="交易员设置--我的跟随者", notes="交易员设置--我的跟随者")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeFollowInfoVo.class)})
- @GetMapping(value = "/getTradeFollowInfo")
+ @PostMapping(value = "/getTradeFollowInfo")
public Result getTradeFollowInfo(@RequestBody @Valid TradeFollowInfoDto tradeFollowInfoDto) {
return documentaryService.getTradeFollowInfo(tradeFollowInfoDto);
+ }
+
+ /**
+ * 交易员设置--踢出跟随者
+ */
+ @ApiOperation(value="交易员设置--踢出跟随者", notes="交易员设置--踢出跟随者")
+ @PostMapping(value = "/getOutFollowInfo")
+ public Result getOutFollowInfo(@RequestBody @Valid OutFollowInfoDto outFollowInfoDto) {
+ return documentaryService.getOutFollowInfo(outFollowInfoDto);
}
/**
@@ -106,6 +119,16 @@
}
/**
+ * 交易员设置--进入编辑---获取标签信息
+ */
+ @ApiOperation(value="交易员设置--进入编辑---获取标签信息", notes="交易员设置--进入编辑---获取标签信息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeSetLabelInfoVo.class)})
+ @GetMapping(value = "/getTradeSetLabelInfo")
+ public Result getTradeSetLabelInfo() {
+ return documentaryService.getTradeSetLabelInfo();
+ }
+
+ /**
* 交易员设置--更新设置
*/
@ApiOperation(value="交易员设置--更新设置", notes="交易员设置--更新设置")
--
Gitblit v1.9.1