From 6cb72d1fda923f2f4964df8efc56452c0d3d084a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Jun 2020 11:36:38 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java b/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java
index 3ae3f16..9ca2106 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java
@@ -10,16 +10,16 @@
 	
 	public String generateSimpleSerialno(String userId);
 
-	Result enterTransactionPageOfWalletCoin(String symbol, String type);
+	Result enterTransactionPageOfWalletCoin(String symbol);
 
 	Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,
 			BigDecimal amount);
 
 	public Result getEntrustWalletCoinOrder(String symbol, Integer status);
 
-	public Result cancelEntrustWalletCoinOrder(String orderNo);
+	public Result cancelEntrustWalletCoinOrder(String orderId);
 
-	public Result findAllWalletCoinOrder();
+	public Result findAllWalletCoinOrder(String symbol);
 
 	public Result findWalletCoinOrder(Long orderId);
 
@@ -27,4 +27,6 @@
 
 	public Result checkIsCollect(String symbol);
 
+	public Result findCollectList();
+
 }

--
Gitblit v1.9.1