From 08133a4fa45cb8ed3da68fea587c6e3199743918 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 29 Jan 2021 17:25:44 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 27 +++++++++++++++++++-------- 1 files changed, 19 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..1df8876 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; @@ -20,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; @@ -281,6 +283,7 @@ } } + @Transactional(rollbackFor = Exception.class) public void wholeBomb() { Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP; if (CollUtil.isEmpty(dataModelMap)) { @@ -289,25 +292,29 @@ 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 +323,11 @@ continue; } + dataModelMap.remove(entry.getKey()); + 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