Merge branch 'master' into whole

Helius

2020-09-10 df91738ff0c87e0f1e0553d9c02ea6d4aaa2582b

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

@@ -123,6 +123,7 @@
            }

            BigDecimal forceSetPrice = BigDecimal.ZERO;

            if (subCnt != 0) {

                log.info("---->{}, {}", walletContract.getAvailableBalance(), bondAmount);

                forceSetPrice = getForceSetPrice(walletContract.getAvailableBalance().add(bondAmount), openPrice, subCnt, sku, type, memberEntity);

            }