Merge branch 'master' into whole_new

Helius

2020-09-11 afc924b0d88ef320ad09060ae49804556efd8eb6

 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;

@@ -136,9 +130,16 @@
                }



//                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);

                BigDecimal divide = sub.abs().divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);

                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);

@@ -149,7 +150,7 @@
                } else {

                    forcePrice  = openPrice.subtract(divide.multiply(divide2));

                }

//                log.info("forcePrice -- {}", forcePrice);

//                log.info("forcePrice -- {}, {}", forcePrice, symbol);

                if (StrUtil.isBlank(currentSymbol)) {

                    holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);

                }