From c119feb821bdb1e6ef407f55056173f752c01c32 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 16 Jul 2020 17:11:20 +0800
Subject: [PATCH] 订单止盈止损类提交
---
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
index 51f7399..a30b9cc 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java
@@ -5,7 +5,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeVo;
+import com.xcong.excoin.modules.coin.parameter.vo.MemberAccountMoneyChangeInfoVo;
+import com.xcong.excoin.modules.coin.parameter.vo.MemberAgentIntoInfoVo;
import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo;
import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;
import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;
@@ -19,13 +20,11 @@
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.dto.TransferOfBalanceDto;
import com.xcong.excoin.modules.coin.parameter.dto.TransferOfBalanceFromAgentDto;
import com.xcong.excoin.modules.coin.service.CoinService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@@ -54,8 +53,11 @@
*/
@ApiOperation(value="获取币币账户某个币种信息", notes="获取币币账户某个币种信息")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberWalletCoinInfoVo.class)})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+ })
@GetMapping(value = "/getWalletCoinBySymbol")
- public Result getWalletCoinBySymbol(@ApiParam(name="symbol",value="币种",required=true)String symbol) {
+ public Result getWalletCoinBySymbol(String symbol) {
return coinService.getWalletCoinBySymbol(symbol);
}
@@ -86,8 +88,11 @@
* @return
*/
@ApiOperation(value="查询币币账户里面的可用资产余额", notes="查询币币账户里面的可用资产余额")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+ })
@GetMapping(value="/findWalletCoinBySymbol")
- public Result findWalletCoinBysymbol(@ApiParam(name="symbol",value="币种",required=true)String symbol) {
+ public Result findWalletCoinBysymbol(String symbol) {
return coinService.findWalletCoinBySymbol(symbol);
}
@@ -107,10 +112,10 @@
* @return
*/
@ApiOperation(value="获取币币资产交易记录", notes="获取币币资产交易记录")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
- @GetMapping(value="/getWalletCoinRecords")
- public Result getWalletCoinRecords() {
- return coinService.getWalletCoinRecords();
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+ @PostMapping(value="/getWalletCoinRecords")
+ public Result getWalletCoinRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletCoinRecords(recordsPageDto);
}
/**
@@ -118,10 +123,10 @@
* @return
*/
@ApiOperation(value="获取合约资产交易记录", notes="获取合约资产交易记录")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
- @GetMapping(value="/getWalletContractRecords")
- public Result getWalletContractRecords() {
- return coinService.getWalletContractRecords();
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+ @PostMapping(value="/getWalletContractRecords")
+ public Result getWalletContractRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletContractRecords(recordsPageDto);
}
/**
@@ -129,10 +134,21 @@
* @return
*/
@ApiOperation(value="获取代理资产交易记录", notes="获取代理资产交易记录")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeVo.class)})
- @GetMapping(value="/getWalletAgentRecords")
- public Result getWalletAgentRecords() {
- return coinService.getWalletAgentRecords();
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAccountMoneyChangeInfoVo.class)})
+ @PostMapping(value="/getWalletAgentRecords")
+ public Result getWalletAgentRecords(@RequestBody @Valid RecordsPageDto recordsPageDto) {
+ return coinService.getWalletAgentRecords(recordsPageDto);
+ }
+
+ /**
+ * 获取代理资产佣金入账
+ * @return
+ */
+ @ApiOperation(value="获取代理资产佣金入账", notes="获取代理资产佣金入账")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAgentIntoInfoVo.class)})
+ @GetMapping(value="/getWalletAgentIntoRecords")
+ public Result getWalletAgentIntoRecords() {
+ return coinService.getWalletAgentIntoRecords();
}
/**
--
Gitblit v1.9.1