modify

Helius

2021-02-05 4e43b6496e163787ea7397ca422c9e081ac2857a

 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java

@@ -233,7 +233,7 @@
        holdOrderEntity.setOpeningPrice(openingPrice);
        holdOrderEntity.setOpeningType(submitOrderDto.getOrderType());
        holdOrderEntity.setMarkPrice(newPrice);
        holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N);
        holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
        holdOrderEntity.setPrePaymentAmount(prePaymentAmount);
        holdOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
        holdOrderEntity.setOperateNo(1);
@@ -525,7 +525,7 @@
                BigDecimal totalEntrustAmount = BigDecimal.ZERO;
                if (CollUtil.isNotEmpty(entrustOrder)) {
                    for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
                        totalEntrustAmount.add(contractEntrustOrderEntity.getEntrustAmount());
                        totalEntrustAmount = totalEntrustAmount.add(contractEntrustOrderEntity.getEntrustAmount());
                    }
                }
                BigDecimal riskRatio = totalHoldBond.divide(walletContractEntity.getTotalBalance().add(totalProfitOrLoss).subtract(totalEntrustAmount), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
@@ -863,10 +863,13 @@
        if (equity.compareTo(BigDecimal.ZERO) <= 0) {
            equity = BigDecimal.ZERO;
        }

        BigDecimal available = walletContractEntity.getAvailableBalance().add(totalProfitOrLess);
        if (available.compareTo(BigDecimal.ZERO) <= 0) {
            equity = BigDecimal.ZERO;
        
        BigDecimal available = walletContractEntity.getAvailableBalance();
        if (totalProfitOrLess.compareTo(BigDecimal.ZERO) <= 0) {
            available = available.add(totalProfitOrLess);
            if (available.compareTo(BigDecimal.ZERO) <= 0) {
                available = BigDecimal.ZERO;
            }
        }
        
        // 获取当日k线的开盘价
@@ -876,7 +879,7 @@
        contractMoneyInfoVo.setBeUsedBondAmount(beUsedBondAmount);
        contractMoneyInfoVo.setFrozenBondAmount(frozenBondAmount);
        contractMoneyInfoVo.setEquity(equity);
        contractMoneyInfoVo.setAvailableBalance(walletContractEntity.getAvailableBalance());
        contractMoneyInfoVo.setAvailableBalance(available);
        contractMoneyInfoVo.setFeeRatio(tradeSetting.getFeeRatio());
        contractMoneyInfoVo.setLeverAgeRatio(tradeSetting.getLeverageRatio());
        contractMoneyInfoVo.setNewPrice(newPriceSymbol);