From 335ec6398bb70d60a765b4782376e8141cbfa9cf Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 12 Oct 2020 16:01:53 +0800
Subject: [PATCH] Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv

---
 src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 779e375..960fda6 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
@@ -36,6 +36,7 @@
 	public Result cancelEntrustWalletCoinOrder(String orderId);
 
 	public Result findAllWalletCoinOrder(FindAllWalletCoinOrderDto findAllWalletCoinOrderDto);
+	public Result findAllWalletCoinOrder();
 
 	public Result findWalletCoinOrder(Long orderId);
 
@@ -51,7 +52,12 @@
 
 	public void handleOrder(List<ExchangeTrade> trades);
 
-	void initOrders(String symbol, Integer type, Integer tradeType, BigDecimal price,
-					BigDecimal amount,BigDecimal entrustAmount);
+
+	/**
+	 *  撮合交易单的撤销方法
+	 * @param orderId
+	 * @return
+	 */
+	public Result cancelEntrustWalletCoinOrderForMatch(String orderId);
 
 }

--
Gitblit v1.9.1