From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java | 9 +++++++--
1 files changed, 7 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 f824d5b..a8f2914 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
@@ -5,12 +5,13 @@
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;
public interface OrderCoinService extends IService<OrderCoinsEntity>{
public String generateSimpleSerialno(String userId);
- Result enterTransactionPageOfWalletCoin(String symbol, String type);
+ Result enterTransactionPageOfWalletCoin(String symbol);
Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,
BigDecimal amount);
@@ -19,7 +20,7 @@
public Result cancelEntrustWalletCoinOrder(String orderId);
- public Result findAllWalletCoinOrder();
+ public Result findAllWalletCoinOrder(FindAllWalletCoinOrderDto findAllWalletCoinOrderDto);
public Result findWalletCoinOrder(Long orderId);
@@ -29,4 +30,8 @@
public Result findCollectList();
+ public Result searchSymbolResultList();
+
+ public void dealEntrustCoinOrder();
+
}
--
Gitblit v1.9.1