From fba9c1b49998de2933f80beb5bd1d841b587e3fb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 Jan 2021 16:25:23 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
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 3d1a49a..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)) {
@@ -297,9 +299,8 @@
Map<String, BigDecimal> prices = new HashMap<>();
for (HoldOrderDataModel holdOrderData : list) {
String price = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderData.getSymbol()));
-// BigDecimal newPrice = new BigDecimal(price);
- BigDecimal newPrice = new BigDecimal("29958.46627789");
-
+ 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