modify

Helius

2021-04-09 9cc84c71b49a861f33ad3ec3681b92f4b08ccfaa

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

@@ -232,7 +232,7 @@
                }





                BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(contractHoldOrderEntity.getSymbol())));

                BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));

                if (type == 2) {

                    log.info("newPrice : {}", newPrice);

                }

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

            }