From 3ffaa6bf323862a3770897d4e934baf98d324c47 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 20 Sep 2020 23:39:55 +0800
Subject: [PATCH] 撮合交易代码提交
---
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
index f9f4ece..bea2599 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -5,6 +5,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import com.alibaba.fastjson.JSONObject;
+import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;
+import com.xcong.excoin.modules.symbols.constants.SymbolsConstats;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -62,12 +65,18 @@
@ApiOperation(value = "提交买卖订单", notes = "提交买卖订单")
@PostMapping(value="/submitSalesWalletCoinOrder")
public Result submitSalesWalletCoinOrder(@RequestBody @Valid SubmitSalesWalletCoinOrderDto submitSalesWalletCoinOrderDto) {
+ log.info("买卖单参数[{}]", JSONObject.toJSONString(submitSalesWalletCoinOrderDto));
String symbol = submitSalesWalletCoinOrderDto.getSymbol();
Integer type = submitSalesWalletCoinOrderDto.getType();
Integer tradeType = submitSalesWalletCoinOrderDto.getTradeType();
BigDecimal price = submitSalesWalletCoinOrderDto.getPrice();
BigDecimal amount = submitSalesWalletCoinOrderDto.getAmount();
- return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount);
+ if(SymbolsConstats.EXCHANGE_SYMBOLS.contains(symbol)){
+ return orderCoinService.submitSalesWalletCoinOrderWithMatch(symbol,type,tradeType,price,amount,submitSalesWalletCoinOrderDto.getEntrustAmount());
+
+ }else{
+ return orderCoinService.submitSalesWalletCoinOrder(symbol,type,tradeType,price,amount,submitSalesWalletCoinOrderDto.getEntrustAmount());
+ }
}
/**
@@ -93,6 +102,7 @@
@PostMapping(value="/cancelEntrustWalletCoinOrder")
public Result cancelEntrustWalletCoinOrder(@RequestBody @Valid CancelEntrustWalletCoinOrderDto cancelEntrustWalletCoinOrderDto) {
String orderId = cancelEntrustWalletCoinOrderDto.getOrderId();
+ // 根据不同币种
return orderCoinService.cancelEntrustWalletCoinOrder(orderId);
}
@@ -167,5 +177,5 @@
public Result searchSymbolResultList() {
return orderCoinService.searchSymbolResultList();
}
-
+
}
--
Gitblit v1.9.1