From 74ca5bc0f40e3b91464c8972392271d24dd5f066 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 14 Sep 2020 11:05:48 +0800
Subject: [PATCH] 撮合交易代码提交
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index 200f4a7..07a9886 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -744,7 +744,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void dealEntrustCoinOrder() {
- List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList();
+ List<String> ignoreTypes = new ArrayList<>();
+ ignoreTypes.add("NEKK");
+ List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList(ignoreTypes);
if (CollUtil.isNotEmpty(list)) {
for (OrderCoinsEntity orderCoinsEntity : list) {
BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(orderCoinsEntity.getSymbol() + "/USDT")));
@@ -813,7 +815,9 @@
public void handleOrder(List<ExchangeTrade> trades){
// 处理撮合交易的订单
for(ExchangeTrade exchangeTrade : trades){
-
+ if(exchangeTrade==null){
+ continue;
+ }
BigDecimal amount = exchangeTrade.getAmount();
Long buyOrderId = exchangeTrade.getBuyOrderId();
BigDecimal buyTurnover = exchangeTrade.getBuyTurnover();
--
Gitblit v1.9.1