From f0e93eb5b38d5ce8abeb949a475d1112c2a1645f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 11:30:44 +0800
Subject: [PATCH] Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow
---
src/main/java/com/xcong/excoin/modules/documentary/controller/DocumentaryController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 49ae7db..5958455 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
@@ -22,6 +22,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,6 +32,8 @@
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;
@@ -40,7 +43,7 @@
@RestController
@Slf4j
@RequestMapping(value = "/api/documentary")
-@Api(value = "MemberQuickBuySaleController", tags = "跟单")
+@Api(value = "DocumentaryController", tags = "跟单---跟随者")
public class DocumentaryController {
@Resource
@@ -49,11 +52,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() {
+ return documentaryService.getFollowFollowerNoticeList();
}
/**
@@ -153,9 +166,9 @@
/**
* 跟单---跟单设置
*/
- @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);
}
@@ -164,9 +177,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