From 705635efdd5000152d9c4423ae980ccdc34632a8 Mon Sep 17 00:00:00 2001 From: zainali5120 <512061637@qq.com> Date: Tue, 23 Feb 2021 20:42:19 +0800 Subject: [PATCH] 波长jar包删除日志配置文件 --- src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java index 1361e4f..9eebe41 100644 --- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java +++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java @@ -45,21 +45,15 @@ MemberSettingDao memberSettingDao = SpringContextHolder.getBean(MemberSettingDao.class); BigDecimal forcePrice = BigDecimal.ZERO; BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN); + if (member.getIsForce() == 1) { + MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId()); + money = money.multiply(memberSetting.getForceParam().multiply(BigDecimal.valueOf(100))); + } //卖空 if (type == 2) { forcePrice = money.add(openPrice); - if (member.getIsForce() == 1) { - MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId()); - //预估强平价 = 预估强平价-预估强平价*系数 - forcePrice = forcePrice.subtract(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam())); - } } else {//开多 forcePrice = openPrice.subtract(money); - if (member.getIsForce() == 1) { - MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId()); - //预估强平价 = 预估强平价-预估强平价*系数 - forcePrice = forcePrice.add(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam())); - } } if (forcePrice.compareTo(BigDecimal.ZERO) < 0) { forcePrice = BigDecimal.ZERO; @@ -112,10 +106,14 @@ BigDecimal profitOrLoss = BigDecimal.ZERO; // 杠杆 int leverRatio = 0; + boolean isAloneLess = true; for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) { BigDecimal bondAmount = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()); if (symbol.equalsIgnoreCase(holdOrderEntity.getSymbol())) { + if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) { + isAloneLess = false; + } symbolFeeAmount = symbolFeeAmount.add(holdOrderEntity.getOpeningFeeAmount()); symbolBondAmount = symbolBondAmount.add(bondAmount); @@ -132,15 +130,27 @@ } // log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio); - BigDecimal sub = walletContract.getTotalBalance().add(profitOrLoss).subtract(symbolFeeAmount).subtract(totalBondAmount); + BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss); + BigDecimal sub = equity.subtract(symbolFeeAmount).subtract(totalBondAmount); // log.info("sub -- {}", sub); + if (sub.compareTo(symbolBondAmount) <= 0) { + BigDecimal multi = BigDecimal.valueOf(10); + BigDecimal divide = equity.divide(equity.add(multi), 8, BigDecimal.ROUND_DOWN); + sub = symbolBondAmount.multiply(divide); + } + BigDecimal divide = sub.divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN); // log.info("divide -- {}", divide); BigDecimal divide2 = openPrice.divide(BigDecimal.valueOf(leverRatio), 8, BigDecimal.ROUND_DOWN); // log.info("divide2 -- {}", divide2); - BigDecimal forcePrice = openPrice.subtract(divide.multiply(divide2)); -// log.info("forcePrice -- {}", forcePrice); + BigDecimal forcePrice = BigDecimal.ZERO; + if (isAloneLess) { + forcePrice = openPrice.add(divide.multiply(divide2)); + } else { + forcePrice = openPrice.subtract(divide.multiply(divide2)); + } +// log.info("forcePrice -- {}, {}", forcePrice, symbol); if (StrUtil.isBlank(currentSymbol)) { holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol); } -- Gitblit v1.9.1