1

zj

2025-10-22 5bfeca1cc5b5263e17c068ca12fbaab1d51917f4

 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java

@@ -525,9 +525,6 @@
        BigDecimal close = realtime.getClose();
        BigDecimal point = close.subtract(order.getTradeAvgPrice());
        BigDecimal profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
        if(null != order.getProfitLossRatio()   || order.getProfitLossRatio() > 0){
            profit = order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN);
        }
        BigDecimal rentalProfit = order.getDeposit().add(profit);
        BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
        order.setAmountClose(order.getAmountClose().add(profit));
@@ -602,11 +599,12 @@
                order.setDepositOpen(applyOrder.getMoney());
                order.setDeposit(applyOrder.getMoney());

                if (order.getLeverRate() != null) {
                    BigDecimal fee = order.getDeposit().multiply(order.getLeverRate()).multiply(item.getUnitFee());
                    fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
                    order.setFee(fee);
                }
//                if (order.getLeverRate() != null) {
//                    BigDecimal fee = order.getDeposit().multiply(order.getLeverRate()).multiply(item.getUnitFee());
//                    fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
//                    order.setFee(fee);
//                }
                order.setFee(applyOrder.getFee());
                double number = strongLevelCalculationService.countSheets(order.getDepositOpen().doubleValue(), order.getLeverRate().intValue(), 0.01, applyOrder.getPrice().doubleValue());
                order.setVolume(new BigDecimal(number));
                order.setVolumeOpen(new BigDecimal(number));