From 5869138e0dafa923173b74679f3564e43c4c683d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 07 Sep 2020 17:24:26 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 20 ++++++++++++--------
1 files changed, 12 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 71dafb0..a6a6dbd 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
@@ -11,10 +11,7 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.rabbit.producer.OrderProducer;
-import com.xcong.excoin.utils.CacheSettingUtils;
-import com.xcong.excoin.utils.CalculateUtil;
-import com.xcong.excoin.utils.RedisUtils;
-import com.xcong.excoin.utils.SpringContextHolder;
+import com.xcong.excoin.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -292,16 +289,23 @@
if (CollUtil.isNotEmpty(holdOrderEntities)) {
BigDecimal totalProfitOrLess = BigDecimal.ZERO;
+ String currentPrice = null;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+ if (symbol.equalsIgnoreCase(holdOrderEntity.getSymbol())) {
+ currentPrice = price;
+ } else {
+ currentPrice = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()));
+ }
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
- BigDecimal profitOrLess = CalculateUtil.calOrderProfitOrLess(holdOrderEntity.getOpeningType(), new BigDecimal(price), holdOrderEntity.getOpeningPrice(), lotNumber, holdOrderEntity.getSymbolCntSale(), memberEntity.getIsProfit());
-
+ BigDecimal profitOrLess = CalculateUtil.calOrderProfitOrLess(holdOrderEntity.getOpeningType(), new BigDecimal(currentPrice), holdOrderEntity.getOpeningPrice(), lotNumber, holdOrderEntity.getSymbolCntSale(), memberEntity.getIsProfit());
+ log.info("profitOrLess : {}, id : {}, symbol : {}, price : {}", profitOrLess, holdOrderEntity.getId(), holdOrderEntity.getSymbol(), currentPrice);
totalProfitOrLess = totalProfitOrLess.add(profitOrLess);
}
-
+ log.info("totalProfitOrLess : {}", totalProfitOrLess);
MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
- BigDecimal sub = wallet.getTotalBalance().subtract(totalProfitOrLess);
+ BigDecimal sub = wallet.getTotalBalance().add(totalProfitOrLess);
+ log.info("sub : {}, memberId : {}", sub, memberId);
if (sub.compareTo(BigDecimal.ZERO) <= 0) {
List<OrderModel> list = new ArrayList<>();
OrderModel orderModel = new OrderModel(null, 0, price, symbol, memberId);
--
Gitblit v1.9.1