From 6e1230da112efd99ef25347d758a5b7d63a92747 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 19:40:01 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index c2011f0..da3d739 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -502,7 +502,7 @@
contractOrderEntity.setRewardRatio(rewardRatio);
contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount());
contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
- contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
+// contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
// 订单状态转换
if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
index e0c2ece..1df8876 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
@@ -21,6 +21,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -282,6 +283,7 @@
}
}
+ @Transactional(rollbackFor = Exception.class)
public void wholeBomb() {
Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP;
if (CollUtil.isEmpty(dataModelMap)) {
@@ -299,7 +301,6 @@
String price = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderData.getSymbol()));
BigDecimal newPrice = new BigDecimal(price);
// BigDecimal newPrice = new BigDecimal("29958.46627789");
-
BigDecimal rewardRatio = null;
if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderData.getOpeningType()) {
@@ -323,7 +324,8 @@
}
dataModelMap.remove(entry.getKey());
- System.out.println("触发");
+ redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+ log.info("全仓爆仓触发:{}", JSONObject.toJSONString(wholePriceData));
wholePriceData.setPrices(prices);
contractHoldOrderDao.updateMemberAllHoldOrderClosingStatus(wholePriceData.getMemberId());
orderProducer.sendWholeBomb(JSONObject.toJSONString(wholePriceData));
--
Gitblit v1.9.1