From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 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 9c8c2c0..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,12 +10,17 @@
import org.springframework.web.bind.annotation.RestController;
import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.documentary.dto.UpdateDocumentaryOrderSetDto;
+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;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
-import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
-import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;
+import com.xcong.excoin.modules.documentary.vo.TradeFollowInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TradeHistoryOrderInfoVo;
+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;
@@ -46,6 +51,55 @@
}
/**
+ * 交易员设置--头部
+ */
+ @ApiOperation(value="交易员设置--头部", notes="交易员设置--头部")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeProfitInfoVo.class)})
+ @GetMapping(value = "/getTradeProfitInfo")
+ public Result getTradeProfitInfo() {
+ return documentaryService.getTradeProfitInfo();
+ }
+
+ /**
+ * 交易员设置--当前带单
+ */
+ @ApiOperation(value="交易员设置--当前带单", notes="交易员设置--当前带单")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeOrderInfoVo.class)})
+ @PostMapping(value = "/getTradeOrderInfo")
+ public Result getTradeOrderInfo(@RequestBody @Valid TradeOrderInfoDto tradeOrderInfoDto) {
+ return documentaryService.getTradeOrderInfo(tradeOrderInfoDto);
+ }
+
+ /**
+ * 交易员设置--历史带单
+ */
+ @ApiOperation(value="交易员设置--历史带单", notes="交易员设置--历史带单")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeHistoryOrderInfoVo.class)})
+ @PostMapping(value = "/getTradeHistoryOrderInfo")
+ public Result getTradeHistoryOrderInfo(@RequestBody @Valid TradeOrderInfoDto tradeOrderInfoDto) {
+ return documentaryService.getTradeHistoryOrderInfo(tradeOrderInfoDto);
+ }
+
+ /**
+ * 交易员设置--我的跟随者
+ */
+ @ApiOperation(value="交易员设置--我的跟随者", notes="交易员设置--我的跟随者")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeFollowInfoVo.class)})
+ @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);
+ }
+
+ /**
* 成为交易员---立即入驻
*/
@ApiOperation(value="成为交易员---立即入驻", notes="成为交易员---立即入驻")
@@ -65,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