From 589a60e79c24aac2fac5a7e00c784d8e4731e036 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 01 Mar 2021 12:50:13 +0800
Subject: [PATCH] 20210301  平仓时间时间戳

---
 src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 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 11c7f7c..2d734e4 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
@@ -7,13 +7,14 @@
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 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.FollowFollowerNoticeDto;
 import com.xcong.excoin.modules.documentary.dto.FollowRecordsDto;
 import com.xcong.excoin.modules.documentary.dto.HistoryOrderRecordsDto;
 import com.xcong.excoin.modules.documentary.dto.MyFollowOrderDto;
@@ -22,6 +23,7 @@
 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.FollowFollowerNoticeVo;
 import com.xcong.excoin.modules.documentary.vo.FollowInfoVo;
 import com.xcong.excoin.modules.documentary.vo.FollowRecordsVo;
 import com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo;
@@ -31,7 +33,10 @@
 import com.xcong.excoin.modules.documentary.vo.MyFollowTraderInfoVo;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +44,7 @@
 @RestController
 @Slf4j
 @RequestMapping(value = "/api/documentary")
-@Api(value = "MemberQuickBuySaleController", tags = "跟单")
+@Api(value = "DocumentaryController", tags = "跟单---跟随者")
 public class DocumentaryController {
 	
 	@Resource
@@ -48,11 +53,21 @@
 	/**
 	 *  获取用户类型是否是交易员
 	 */
-	@ApiOperation(value="获取用户类型是否是交易员", notes="获取用户类型是否是交易员")
+	@ApiOperation(value="获取用户是否是交易员", notes="获取用户是否是交易员")
 	@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
-	@GetMapping(value = "/getMemberIsTradeInfo")
-	public Result  getMemberIsTradeInfo() {
+	@GetMapping(value = "/getMemberIsTrader")
+	public Result  getMemberIsTrader() {
 		return documentaryService.getMemberIsTradeInfo();
+	}
+	
+	/**
+	 *  通知消息
+	 */
+	@ApiOperation(value="通知消息", notes="通知消息")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowFollowerNoticeVo.class)})
+	@PostMapping(value = "/getFollowFollowerNoticeList")
+	public Result  getFollowFollowerNoticeList(@RequestBody @Valid FollowFollowerNoticeDto followFollowerNoticeDto) {
+		return documentaryService.getFollowFollowerNoticeList(followFollowerNoticeDto);
 	}
 	
 	/**
@@ -63,6 +78,16 @@
 	@PostMapping(value = "/getFollowTraderProfitInfo")
 	public Result  getFollowTraderProfitInfo(@RequestBody @Valid RecordsPageDto recordsPageDto) {
 		return documentaryService.getFollowTraderProfitInfo(recordsPageDto);
+	}
+	
+	/**
+	 *  交易员详情---头部
+	 */
+	@ApiOperation(value="交易员详情---头部", notes="交易员详情---头部")
+	@ApiResponses({@ApiResponse( code = 200, message = "success", response = FollowTraderProfitInfoVo.class)})
+	@GetMapping(value = "/getFollowTraderProfit")
+	public Result  getFollowTraderProfit(@ApiParam(name = "traderId", value = "交易员ID", example = "1") @RequestParam(value = "traderId", required = false) long traderId) {
+		return documentaryService.getFollowTraderProfit(traderId);
 	}
 	
 	/**
@@ -140,11 +165,11 @@
 	}
 	
 	/**
-	 *  跟单---跟单设置
+	 *  跟单---跟单设置--新增跟单
 	 */
-	@ApiOperation(value="跟单---跟单设置", notes="跟单---跟单设置")
-	@PostMapping(value = "/getDocumentaryOrderSet")
-	public Result  getDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
+	@ApiOperation(value="跟单---跟单设置--新增跟单", notes="跟单---跟单设置--新增跟单")
+	@PostMapping(value = "/addDocumentaryOrderSet")
+	public Result  addDocumentaryOrderSet(@RequestBody @Valid DocumentaryOrderSetDto documentaryOrderSetDto) {
 		return documentaryService.getDocumentaryOrderSet(documentaryOrderSetDto);
 	}
 	
@@ -153,9 +178,12 @@
 	 */
 	@ApiOperation(value="跟单---跟单设置--进入编辑", notes="跟单---跟单设置--进入编辑")
 	@ApiResponses({@ApiResponse( code = 200, message = "success", response = DocumentaryOrderSetInfoVo.class)})
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "tradeId", value = "交易员ID", required = true, dataType = "String", paramType="query")
+	})
 	@GetMapping(value = "/getDocumentaryOrderSetInfo")
-	public Result  getDocumentaryOrderSetInfo() {
-		return documentaryService.getDocumentaryOrderSetInfo();
+	public Result  getDocumentaryOrderSetInfo(String tradeId) {
+		return documentaryService.getDocumentaryOrderSetInfo(tradeId);
 	}
 	
 	/**

--
Gitblit v1.9.1