From 8b69c02da0657625068c039b6996d80ed6c15783 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Jun 2020 19:59:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
index 006490e..4202ea9 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -48,12 +48,11 @@
 	@ApiOperation(value = "进入交易页面", notes = "进入交易页面")
 	@ApiResponses({@ApiResponse( code = 200, message = "success", response = TransactionPageOfWalletCoinVo.class)})
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),
-		@ApiImplicitParam(name = "type", value = "买入卖出类型1:买入,2:卖出", required = true, dataType = "String", paramType="query")
+		@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
 	})
     @GetMapping(value = "/enterTransactionPageOfWalletCoin")
-	public Result enterTransactionPageOfWalletCoin(String symbol,String type) {
-		return orderCoinService.enterTransactionPageOfWalletCoin(symbol,type);
+	public Result enterTransactionPageOfWalletCoin(String symbol) {
+		return orderCoinService.enterTransactionPageOfWalletCoin(symbol);
 	}
 	
 	/**
@@ -103,9 +102,12 @@
 	 */
 	@ApiOperation(value = "获取币币交易历史订单信息", notes = "获取币币交易历史订单信息")
 	@ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinDealListVo.class)})
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+	})
     @GetMapping(value = "/findAllWalletCoinOrder")
-	public Result  findAllWalletCoinOrder() {
-		return orderCoinService.findAllWalletCoinOrder();
+	public Result  findAllWalletCoinOrder(String symbol) {
+		return orderCoinService.findAllWalletCoinOrder(symbol);
 	}
 	
 	/**

--
Gitblit v1.9.1