From 43385a77303aa2295d902b5a2be9e28723d08cef Mon Sep 17 00:00:00 2001 From: zainali5120 <512061637@qq.com> Date: Mon, 12 Oct 2020 16:00:21 +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 | 3 +-- 1 files changed, 1 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 51a199f..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,8 +52,6 @@ public void handleOrder(List<ExchangeTrade> trades); - void initOrders(String symbol, Integer type, Integer tradeType, BigDecimal price, - BigDecimal amount,BigDecimal entrustAmount); /** * 撮合交易单的撤销方法 -- Gitblit v1.9.1