From d5b1ec5dca1aefb6425d2e12b1b2804714019c27 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 16:31:21 +0800
Subject: [PATCH] whole bomb finish
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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..3d1a49a 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,7 @@
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.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;
@@ -289,25 +290,30 @@
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;
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);
+ 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,7 +322,10 @@
continue;
}
+ dataModelMap.remove(entry.getKey());
+ System.out.println("触发");
wholePriceData.setPrices(prices);
+ contractHoldOrderDao.updateMemberAllHoldOrderClosingStatus(wholePriceData.getMemberId());
orderProducer.sendWholeBomb(JSONObject.toJSONString(wholePriceData));
}
}
--
Gitblit v1.9.1