From 17fb78903b310564aaeea6e4fd50824f45d4677a Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Tue, 13 Oct 2020 15:55:39 +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 |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 8bf291c..5be578b 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
@@ -16,7 +16,7 @@
 	Result enterTransactionPageOfWalletCoin(String symbol);
 
 	Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,
-			BigDecimal amount);
+			BigDecimal amount,BigDecimal entrustAmount);
 
 	/**
 	 *  需要撮合交易的币种提交买卖单
@@ -36,6 +36,7 @@
 	public Result cancelEntrustWalletCoinOrder(String orderId);
 
 	public Result findAllWalletCoinOrder(FindAllWalletCoinOrderDto findAllWalletCoinOrderDto);
+	public Result findAllWalletCoinOrder();
 
 	public Result findWalletCoinOrder(Long orderId);
 
@@ -51,4 +52,14 @@
 
 	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