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 | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 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 9ca2106..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
@@ -1,10 +1,13 @@
package com.xcong.excoin.modules.coin.service;
import java.math.BigDecimal;
+import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;
+import com.xcong.excoin.modules.coin.parameter.dto.FindAllWalletCoinOrderDto;
+import com.xcong.excoin.trade.ExchangeTrade;
public interface OrderCoinService extends IService<OrderCoinsEntity>{
@@ -13,13 +16,27 @@
Result enterTransactionPageOfWalletCoin(String symbol);
Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,
- BigDecimal amount);
+ BigDecimal amount,BigDecimal entrustAmount);
+
+ /**
+ * 需要撮合交易的币种提交买卖单
+ * @param symbol
+ * @param type
+ * @param tradeType
+ * @param price
+ * @param amount
+ * @param entrustAmount
+ * @return
+ */
+ Result submitSalesWalletCoinOrderWithMatch(String symbol, Integer type, Integer tradeType, BigDecimal price,
+ BigDecimal amount,BigDecimal entrustAmount);
public Result getEntrustWalletCoinOrder(String symbol, Integer status);
public Result cancelEntrustWalletCoinOrder(String orderId);
- public Result findAllWalletCoinOrder(String symbol);
+ public Result findAllWalletCoinOrder(FindAllWalletCoinOrderDto findAllWalletCoinOrderDto);
+ public Result findAllWalletCoinOrder();
public Result findWalletCoinOrder(Long orderId);
@@ -29,4 +46,23 @@
public Result findCollectList();
+ public Result searchSymbolResultList();
+
+ public void dealEntrustCoinOrder();
+
+ 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