From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 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 bdc4fba..3b914bc 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
@@ -12,6 +12,8 @@
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
+import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
+import com.xcong.excoin.rabbit.pricequeue.whole.HoldOrderDataModel;
import com.xcong.excoin.rabbit.pricequeue.whole.WholeDataQueue;
import com.xcong.excoin.rabbit.pricequeue.whole.WholePriceDataModel;
import com.xcong.excoin.rabbit.producer.OrderProducer;
@@ -20,6 +22,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;
@@ -40,6 +43,9 @@
private MemberDao memberDao;
@Resource
private MemberWalletContractDao memberWalletContractDao;
+
+ @Resource
+ private CacheSettingUtils cacheSettingUtils;
/**
* @param symbol
* @param price
@@ -289,25 +295,41 @@
for (Map.Entry<String, WholePriceDataModel> entry : dataModelMap.entrySet()) {
WholePriceDataModel wholePriceData = entry.getValue();
- List<ContractHoldOrderEntity> list = wholePriceData.getList();
+ List<HoldOrderDataModel> list = wholePriceData.getList();
if (CollUtil.isNotEmpty(list)) {
BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
+
+ MemberEntity memberEntity = memberDao.selectById(Long.parseLong(entry.getKey()));
Map<String, BigDecimal> prices = new HashMap<>();
- for (ContractHoldOrderEntity holdOrderEntity : list) {
- BigDecimal newPrice = (BigDecimal) redisUtils.get(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()));
+ for (HoldOrderDataModel holdOrderData : list) {
+ 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 == holdOrderEntity.getOpeningType()) {
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderData.getOpeningType()) {
// (最新价-开仓价)*规格*张数
- rewardRatio = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(holdOrderEntity.getSymbolSku()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale()));
+ rewardRatio = newPrice.subtract(holdOrderData.getOpeningPrice()).multiply(holdOrderData.getSymbolSku()).multiply(new BigDecimal(holdOrderData.getSymbolCntSale()));
// 开空
} else {
// (开仓价-最新价)*规格*张数
- rewardRatio = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(holdOrderEntity.getSymbolSku()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale()));
+ rewardRatio = holdOrderData.getOpeningPrice().subtract(newPrice).multiply(holdOrderData.getSymbolSku()).multiply(new BigDecimal(holdOrderData.getSymbolCntSale()));
}
- totalProfitOrLoss = totalProfitOrLoss.add(rewardRatio);
- prices.put(holdOrderEntity.getSymbol(), newPrice);
+
+ if (memberEntity.getIsProfit() == MemberEntity.IS_PROFIT_Y) {
+ PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+ if (rewardRatio.compareTo(BigDecimal.ZERO) > -1) {
+ rewardRatio = rewardRatio.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getProfitParam()));
+ } else {
+// rewardRatio = rewardRatio.multiply(BigDecimal.ONE.add(tradeSettingEntity.getProfitParam()));
+ }
+ }
+
+ holdOrderData.setRewardAmount(rewardRatio);
+ holdOrderData.setClosingPrice(newPrice);
+ totalProfitOrLoss = totalProfitOrLoss.add(rewardRatio).setScale(8, BigDecimal.ROUND_DOWN);
+ prices.put(holdOrderData.getSymbol(), newPrice);
}
BigDecimal holdBond = wholePriceData.getHoldBond();
@@ -316,8 +338,20 @@
continue;
}
- wholePriceData.setPrices(prices);
- orderProducer.sendWholeBomb(JSONObject.toJSONString(wholePriceData));
+ log.info("过来过来");
+ synchronized(this) {
+ log.info("爆仓啥的:{}", entry.getKey());
+ boolean b = redisUtils.setNotExist(AppContants.WHOLE_BOMB_PREFIX + entry.getKey(), 1, 5);
+ if (b) {
+ dataModelMap.remove(entry.getKey());
+ wholePriceData.setEquity(wholePriceData.getBalance().add(totalProfitOrLoss));
+ 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