From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 ae140b0..1e7c417 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
@@ -10,11 +10,13 @@
import org.springframework.web.bind.annotation.RestController;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.documentary.dto.BeTraderDto;
import com.xcong.excoin.modules.documentary.dto.OutFollowInfoDto;
import com.xcong.excoin.modules.documentary.dto.TradeFollowInfoDto;
import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;
import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+import com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo;
import com.xcong.excoin.modules.documentary.vo.TradeFollowInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeHistoryOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeOrderInfoVo;
@@ -39,6 +41,16 @@
@Resource
DocumentaryService documentaryService;
+
+ /**
+ * 成为交易员---条件查询
+ */
+ @ApiOperation(value="成为交易员---条件查询", notes="成为交易员---条件查询")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = BeTraderConditionVo.class)})
+ @GetMapping(value = "/beTraderStatusCondition")
+ public Result beTraderCondition() {
+ return documentaryService.beTraderCondition();
+ }
/**
* 成为交易员---状态查询
@@ -103,9 +115,9 @@
* 成为交易员---立即入驻
*/
@ApiOperation(value="成为交易员---立即入驻", notes="成为交易员---立即入驻")
- @GetMapping(value = "/beTrader")
- public Result beTrader() {
- return documentaryService.beTrader();
+ @PostMapping(value = "/beTrader")
+ public Result beTrader(@RequestBody @Valid BeTraderDto beTraderDto) {
+ return documentaryService.beTrader(beTraderDto);
}
/**
--
Gitblit v1.9.1