modify

Helius

2021-04-09 1c6bf3e15cf135fadcac5e4e40af418d8d0ab0b7

modify

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

@@ -266,13 +266,14 @@
            BigDecimal ratio = contractHoldOrderEntity.getOpeningPrice().multiply(new BigDecimal("0.005"));

            // 总账户 - 维持保证金

            BigDecimal orderProfitOrLoss = walletContract.getTotalBalance().subtract(holdBond);

            // 权益

            BigDecimal qy = walletContract.getTotalBalance().add(totalProfitOrLoss);

            // 权益 - 维持保证金

            BigDecimal qy = walletContract.getTotalBalance().add(totalProfitOrLoss).subtract(holdBond);

//            BigDecimal qy = BigDecimal.ZERO;



            BigDecimal prefix = cost.subtract(ratio);

            BigDecimal prefix = cost.subtract(totalBondAmount);

            BigDecimal divideChild;

            if (ContractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {

                divideChild = cost.subtract(orderProfitOrLoss).subtract(qy);

                divideChild = prefix.subtract(orderProfitOrLoss).subtract(qy);

            } else {

                divideChild = prefix.add(orderProfitOrLoss).add(qy);

            }


 src/test/java/com/xcong/excoin/WholeTest.java

@@ -203,8 +203,8 @@
    public void wholeForceNewTest() {
        BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey("BTC/USDT")));

        MemberEntity memberEntity = memberDao.selectById(15L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(767L);
        MemberEntity memberEntity = memberDao.selectById(16L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(769L);

        System.out.println(CalculateUtil.calWholePriceTwo(memberEntity, holdOrder, 2));
    }