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 |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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 43d8ed8..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,17 +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.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;
@@ -44,5 +53,27 @@
 	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