From 7fdce27927b4dfee1e1c8bfd0755e1e5dd28ce93 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 30 Jul 2020 16:52:01 +0800
Subject: [PATCH] 20200730  代码提交

---
 src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java |   78 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 72 insertions(+), 6 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 afc32f9..521122f 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
@@ -12,13 +12,19 @@
 import com.xcong.excoin.common.response.Result;
 import com.xcong.excoin.modules.coin.parameter.dto.RecordsPageDto;
 import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;
+import com.xcong.excoin.modules.documentary.dto.CancelDocumentaryOrderSetDto;
+import com.xcong.excoin.modules.documentary.dto.DocumentaryOrderSetDto;
 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.dto.UpdateDocumentaryOrderSetDto;
 import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderInfoVo;
+import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
 import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
 import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
+import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo;
 import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo;
 import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;
 import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;
@@ -52,7 +58,7 @@
 	 *  交易员列表
 	 */
 	@ApiOperation(value="交易员列表", notes="交易员列表")
-	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)})
 	@PostMapping(value = "/getFollowTraderProfitInfo")
 	public Result  getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) {
 		return documentaryService.getFollowTraderProfitInfo(recordsPageDto);
@@ -91,14 +97,25 @@
 	}
 	
 	/**
-	 *  我的跟单--我的跟单
+	 *  我的跟单--我的跟单--当前跟单
 	 * @return
 	 */
-	@ApiOperation(value="我的跟单--我的跟单", notes="我的跟单--我的跟单")
+	@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);
+	@PostMapping(value = "/getNowMyFollowOrderRecords")
+	public Result  getNowMyFollowOrderRecords(@RequestBody @Valid MyFollowOrderDto myFollowOrderDto) {
+		return documentaryService.getNowMyFollowOrderRecords(myFollowOrderDto);
+	}
+	
+	/**
+	 *  我的跟单--我的跟单--历史跟单
+	 * @return
+	 */
+	@ApiOperation(value="我的跟单--我的跟单--历史跟单", notes="我的跟单--我的跟单--历史跟单")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MyFollowOrderVo.class)})
+	@PostMapping(value = "/getHistoryMyFollowOrderRecords")
+	public Result  getHistoryMyFollowOrderRecords(@RequestBody @Valid MyFollowOrderDto myFollowOrderDto) {
+		return documentaryService.getHistoryMyFollowOrderRecords(myFollowOrderDto);
 	}
 	
 	/**
@@ -111,6 +128,55 @@
 		return documentaryService.getMyFollowTraderInfo(myFollowTraderInfoDto);
 	}
 	
+	/**
+	 *  跟单---跟单设置--跟单合约
+	 */
+	@ApiOperation(value="跟单---跟单设置--跟单合约", notes="跟单---跟单设置--跟单合约")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = DocumentaryOrderInfoVo.class)})
+	@GetMapping(value = "/getDocumentaryOrderInfo")
+	public Result  getDocumentaryOrderInfo() {
+		return documentaryService.getDocumentaryOrderInfo();
+	}
+	
+	/**
+	 *  跟单---跟单设置
+	 */
+	@ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置")
+	@PostMapping(value = "/getDocumentaryOrderSet")
+	public Result  getDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
+		return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);
+	}
+	
+	/**
+	 *  跟单---跟单设置--进入编辑
+	 */
+	@ApiOperation(value="跟单---跟单设置--进入编辑", notes="跟单---跟单设置--进入编辑")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = DocumentaryOrderSetInfoVo.class)})
+	@GetMapping(value = "/getDocumentaryOrderSetInfo")
+	public Result  getDocumentaryOrderSetInfo() {
+		return documentaryService.getDocumentaryOrderSetInfo();
+	}
+	
+	/**
+	 *  跟单---跟单设置--取消跟随
+	 */
+	@ApiOperation(value="跟单---跟单设置--取消跟随", notes="跟单---跟单设置--取消跟随")
+	@PostMapping(value = "/cancelDocumentaryOrderSetInfo")
+	public Result  cancelDocumentaryOrderSetInfo(@RequestBody @Valid CancelDocumentaryOrderSetDto cancelDocumentaryOrderSetDto) {
+		return documentaryService.cancelDocumentaryOrderSetInfo(cancelDocumentaryOrderSetDto);
+	}
+	
+	/**
+	 *  跟单---跟单设置--更新
+	 */
+	@ApiOperation(value="跟单---跟单设置--更新", notes="跟单---跟单设置--更新")
+	@PostMapping(value = "/updateDocumentaryOrderSetInfo")
+	public Result  updateDocumentaryOrderSetInfo(@RequestBody @Valid UpdateDocumentaryOrderSetDto updateDocumentaryOrderSetDto) {
+		return documentaryService.updateDocumentaryOrderSetInfo(updateDocumentaryOrderSetDto);
+	}
+	
+
+	
 	
 	
 	

--
Gitblit v1.9.1