From d06ad40bfc01f17441527a710dd91e30ebe6ddb0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Jul 2020 15:32:37 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
index 24941bb..afc32f9 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java
@@ -4,6 +4,7 @@
import javax.validation.Valid;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -13,9 +14,14 @@
import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;
import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto;
import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;
+import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;
+import com.xcong.excoin.modules.documentary.dto.MyFollowTraderInfoDto;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo;
+import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;
+import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,7 +41,7 @@
/**
* 获取用户类型是否是交易员
*/
- @ApiOperation(value="getMemberIsTradeInfo", notes="获取用户类型是否是交易员")
+ @ApiOperation(value="获取用户类型是否是交易员", notes="获取用户类型是否是交易员")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
@GetMapping(value = "/getMemberIsTradeInfo")
public Result getMemberIsTradeInfo() {
@@ -43,11 +49,11 @@
}
/**
- * 交易员收益信息列表
+ * 交易员列表
*/
- @ApiOperation(value="getFollowTraderProfitInfo", notes="交易员收益信息列表")
+ @ApiOperation(value="交易员列表", notes="交易员列表")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
- @GetMapping(value = "/getFollowTraderProfitInfo")
+ @PostMapping(value = "/getFollowTraderProfitInfo")
public Result getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) {
return documentaryService.getFollowTraderProfitInfo(recordsPageDto);
}
@@ -56,9 +62,9 @@
* 历史带单
* @return
*/
- @ApiOperation(value="getHistoryOrderRecords", notes="历史带单")
+ @ApiOperation(value="历史带单", notes="历史带单")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})
- @GetMapping(value = "/getHistoryOrderRecords")
+ @PostMapping(value = "/getHistoryOrderRecords")
public Result getHistoryOrderRecords(@RequestBody @Valid HistoryOrderRecordsDto historyOrderRecordsDto) {
return documentaryService.getHistoryOrderRecords(historyOrderRecordsDto);
}
@@ -67,13 +73,52 @@
* 跟随者
* @return
*/
- @ApiOperation(value="getFollowRecords", notes="跟随者")
+ @ApiOperation(value="跟随者", notes="跟随者")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowRecordsVo.class)})
- @GetMapping(value = "/getFollowRecords")
+ @PostMapping(value = "/getFollowRecords")
public Result getFollowRecords(@RequestBody @Valid FollowRecordsDto followRecordsDto) {
return documentaryService.getFollowRecords(followRecordsDto);
}
+ /**
+ * 我的跟单--头部
+ */
+ @ApiOperation(value="我的跟单--头部", notes="我的跟单--头部")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowInfoVo.class)})
+ @GetMapping(value = "/getFollowInfo")
+ public Result getFollowInfo() {
+ return documentaryService.getFollowInfo();
+ }
+
+ /**
+ * 我的跟单--我的跟单
+ * @return
+ */
+ @ApiOperation(value="我的跟单--我的跟单", notes="我的跟单--我的跟单")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MyFollowOrderVo.class)})
+ @PostMapping(value = "/getMyFollowOrderRecords")
+ public Result getMyFollowOrderRecords(@RequestBody @Valid MyFollowOrderDto myFollowOrderDto) {
+ return documentaryService.getMyFollowOrderRecords(myFollowOrderDto);
+ }
+
+ /**
+ * 我的跟单--我的交易员
+ */
+ @ApiOperation(value="我的跟单--我的交易员", notes="我的跟单--我的交易员")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MyFollowTraderInfoVo.class)})
+ @PostMapping(value = "/getMyFollowTraderInfo")
+ public Result getMyFollowTraderInfo(@RequestBody @Valid MyFollowTraderInfoDto myFollowTraderInfoDto) {
+ return documentaryService.getMyFollowTraderInfo(myFollowTraderInfoDto);
+ }
+
+
+
+
+
+
+
+
+
--
Gitblit v1.9.1