From fba8eb05dcb8b08f894a3924316874b233030e92 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Oct 2020 12:07:23 +0800
Subject: [PATCH] Merge branch 'pilot' of https://gitee.com/chonggaoxiao/new_excoin into pilot

---
 src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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..a1e3301 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,17 @@
 
 	public void handleOrder(List<ExchangeTrade> trades);
 
+	public void completeOrder(List<OrderCoinsEntity> 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