From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

---
 src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java |   16 +++++++++++++++-
 1 files changed, 15 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..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
@@ -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,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