Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

Helius

2020-09-24 3e32ab49044296b0147bf0a37370375e38df41a2

 src/main/java/com/xcong/excoin/utils/CalculateUtil.java

@@ -46,21 +46,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;

@@ -99,7 +93,7 @@
            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;

@@ -118,12 +112,13 @@
                    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) {

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