Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

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

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