From a0b81b859ec79565ade8dbb4262632d36d6fd432 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 02 Sep 2020 18:37:32 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 4aa9299..9a6b047 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -86,16 +86,12 @@
/**
* 全仓模式 -- 预估强平价
* 面值*(多单张数*多单开仓价-空单张数*空单开仓价)-余额-已实现盈亏 / 面值*(多单张数-空单张数)-(维持保证金率+TAKER手续费)*面值*(开多张数+开空张数)
- *
*/
public static void getForceSetPriceForWhole(@NotNull String symbol, @NotNull MemberEntity memberEntity) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
- CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class);
Long memberId = memberEntity.getId();
- BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
- PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
MemberWalletContractEntity walletContract = walletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(symbol));
List<ContractHoldOrderEntity> holdOrderEntities = holdOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, symbol);
if (CollUtil.isNotEmpty(holdOrderEntities)) {
@@ -103,42 +99,46 @@
int subCnt = 0;
BigDecimal openPrice = BigDecimal.ZERO;
int type = 1;
- BigDecimal feeAmount = BigDecimal.ZERO;
+ BigDecimal bondAmount = BigDecimal.ZERO;
BigDecimal sku = BigDecimal.ZERO;
+ Long id = 0L;
+ int operateNo = 0;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
- if (maxCnt == 0) {
- maxCnt = holdOrderEntity.getSymbolCntSale();
- subCnt = holdOrderEntity.getSymbolCntSale();
- type = holdOrderEntity.getOpeningType();
- openPrice = holdOrderEntity.getOpeningPrice();
- }
-
if (holdOrderEntity.getSymbolCntSale() >= maxCnt) {
int temp = maxCnt;
maxCnt = holdOrderEntity.getSymbolCntSale();
subCnt = holdOrderEntity.getSymbolCntSale() - temp;
openPrice = holdOrderEntity.getOpeningPrice();
type = holdOrderEntity.getOpeningType();
+
+ id = holdOrderEntity.getId();
+ operateNo = holdOrderEntity.getOperateNo() + 1;
+ } else {
+ subCnt = maxCnt - holdOrderEntity.getSymbolCntSale();
}
- feeAmount = feeAmount.add(holdOrderEntity.getOpeningFeeAmount());
+
+ bondAmount = bondAmount.add(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()));
sku = holdOrderEntity.getSymbolSku();
}
BigDecimal forceSetPrice = BigDecimal.ZERO;
if (subCnt != 0) {
- log.info("{}, {}, {}, {}, {}", openPrice, subCnt, sku, type, maxCnt);
- forceSetPrice = getForceSetPrice(walletContract.getTotalBalance().subtract(feeAmount), openPrice, subCnt, sku, type, memberEntity);
+ log.info("---->{}, {}", walletContract.getAvailableBalance(), bondAmount);
+ forceSetPrice = getForceSetPrice(walletContract.getAvailableBalance().add(bondAmount), openPrice, subCnt, sku, type, memberEntity);
}
log.info("强平价:{}", forceSetPrice);
for (ContractHoldOrderEntity updateHoldOrder : holdOrderEntities) {
updateHoldOrder.setForceClosingPrice(forceSetPrice);
updateHoldOrder.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
+ updateHoldOrder.setOperateNo(operateNo);
holdOrderDao.updateById(updateHoldOrder);
+ }
- if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
-// sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());
- }
+
+ if (forceSetPrice.compareTo(BigDecimal.ZERO) > 0) {
+ log.info("id:{}, type:{}, forceSetPrice:{}, symbol:{}, operateNo:{}", id, type, forceSetPrice, symbol, operateNo);
+ sendOrderBombMsg(id, type, forceSetPrice, symbol, operateNo, memberEntity.getId());
}
}
}
@@ -222,14 +222,14 @@
*/
- private static void sendOrderBombMsg(Long id, int type, BigDecimal forceClosingPrice, String symbol, int operateNo) {
+ private static void sendOrderBombMsg(Long id, int type, BigDecimal forceClosingPrice, String symbol, int operateNo, Long memberId) {
OrderModel model = null;
// 开多
if (ContractHoldOrderEntity.OPENING_TYPE_MORE == type) {
- model = new OrderModel(id, RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), symbol, operateNo);
+ model = new OrderModel(id, RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), symbol, operateNo, memberId);
// 开空
} else {
- model = new OrderModel(id, RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), symbol, operateNo);
+ model = new OrderModel(id, RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), forceClosingPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), symbol, operateNo, memberId);
}
SpringContextHolder.getBean(OrderProducer.class).sendPriceOperate(JSONObject.toJSONString(model));
}
--
Gitblit v1.9.1