From c914a8a5537830137a9d662bcfe4696fb386f02c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Sep 2020 18:55:21 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 5d90b5e..7c38f6d 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.rabbit.pricequeue;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
@@ -290,13 +291,11 @@
if (CollUtil.isNotEmpty(holdOrderEntities)) {
BigDecimal totalProfitOrLess = BigDecimal.ZERO;
- String currentPrice = null;
+ Map<String, Object> priceMap = new HashMap<>();
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
- if (symbol.equalsIgnoreCase(holdOrderEntity.getSymbol())) {
- currentPrice = price;
- } else {
- currentPrice = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()));
- }
+ String currentPrice = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()));
+ priceMap.put(holdOrderEntity.getSymbol(), currentPrice);
+
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
BigDecimal profitOrLess = CalculateUtil.calOrderProfitOrLess(holdOrderEntity.getOpeningType(), new BigDecimal(currentPrice), holdOrderEntity.getOpeningPrice(), lotNumber, holdOrderEntity.getSymbolCntSale(), memberEntity.getIsProfit());
totalProfitOrLess = totalProfitOrLess.add(profitOrLess);
@@ -304,20 +303,21 @@
MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
BigDecimal sub = wallet.getTotalBalance().add(totalProfitOrLess);
-// log.info("sub : {}, memberId : {}", sub, memberId);
- if (sub.compareTo(BigDecimal.ZERO) <= 0) {
+ BigDecimal target = wallet.getTotalBalance().multiply(BigDecimal.valueOf(0.01));
+ log.info("sub : {}, target : {}", sub, target);
+ if (sub.compareTo(target) <= 0) {
List<OrderModel> list = new ArrayList<>();
OrderModel orderModel = new OrderModel(null, 0, price, symbol, memberId);
list.add(orderModel);
String content = JSONObject.toJSONString(list);
String key = AppContants.WHOLE_BOMB_PREFIX + memberId;
- String value = redisUtils.getString(key);
- if (StrUtil.isBlank(value)) {
+ Map<Object, Object> value = redisUtils.hmget(key);
+ if (MapUtil.isEmpty(value)) {
orderProducer.sendWholeBomb(content);
contractHoldOrderDao.updateMemberAllHoldOrderClosingStatus(memberId);
- redisUtils.set(key, memberId);
+ redisUtils.hmset(key, priceMap);
}
}
}
--
Gitblit v1.9.1