From 74d3712317f0596e5d424a00239c7c3742db78a5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 04 Aug 2020 16:16:00 +0800
Subject: [PATCH] Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow
---
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 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 945ef3b..4fecaae 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
@@ -1,16 +1,26 @@
package com.xcong.excoin.modules.documentary.controller;
import javax.annotation.Resource;
+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;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.documentary.dto.UpdateDocumentaryOrderSetDto;
+import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
-import com.xcong.excoin.modules.documentary.vo.MemberIsTradeVo;
+import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.MyFollowOrderVo;
+import com.xcong.excoin.modules.documentary.vo.TradeSetInfoVo;
+import com.xcong.excoin.modules.documentary.vo.TraderStatusVo;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -26,13 +36,44 @@
DocumentaryService documentaryService;
/**
+ * 成为交易员---状态查询
+ */
+ @ApiOperation(value="成为交易员---状态查询", notes="成为交易员---状态查询")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TraderStatusVo.class)})
+ @GetMapping(value = "/beTraderStatus")
+ public Result beTraderStatus() {
+ return documentaryService.beTraderStatus();
+ }
+
+ /**
* 成为交易员---立即入驻
*/
@ApiOperation(value="成为交易员---立即入驻", notes="成为交易员---立即入驻")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberIsTradeVo.class)})
- @GetMapping(value = "/getTraderInfo")
- public Result getMemberIsTradeInfo() {
- return documentaryService.getMemberIsTradeInfo();
+ @GetMapping(value = "/beTrader")
+ public Result beTrader() {
+ return documentaryService.beTrader();
+ }
+
+ /**
+ * 交易员设置--进入编辑
+ */
+ @ApiOperation(value="交易员设置--进入编辑", notes="交易员设置--进入编辑")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = TradeSetInfoVo.class)})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "tradeId", value = "交易员ID", required = true, dataType = "String", paramType="query")
+ })
+ @GetMapping(value = "/getTradeSetInfo")
+ public Result getTradeSetInfo(String tradeId) {
+ return documentaryService.getTradeSetInfo(tradeId);
+ }
+
+ /**
+ * 交易员设置--更新设置
+ */
+ @ApiOperation(value="交易员设置--更新设置", notes="交易员设置--更新设置")
+ @PostMapping(value = "/updateTradeSetInfo")
+ public Result updateTradeSetInfo(@RequestBody @Valid UpdateTradeSetInfoDto updateTradeSetInfoDto) {
+ return documentaryService.updateTradeSetInfo(updateTradeSetInfoDto);
}
}
--
Gitblit v1.9.1