1

zj

2025-10-15 6a4535b1e7541156f4c3c899bd7370eec79f0dee

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

@@ -567,12 +567,14 @@
                f.setTradeAvgPrice((f.getTradeAvgPrice().add(realtime.getClose())).divide(new BigDecimal(2)).setScale(4, RoundingMode.DOWN));

                BigDecimal fee = BigDecimal.ZERO;
                if (f.getLeverRate() != null) {

                    fee = applyOrder.getDeposit().multiply(f.getLeverRate()).multiply(item.getUnitFee());
                    fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
                    f.setFee(f.getFee().add(fee));
                }
//                if (f.getLeverRate() != null) {
//
//                    fee = applyOrder.getDeposit().multiply(f.getLeverRate()).multiply(item.getUnitFee());
//                    fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
//                    f.setFee(f.getFee().add(fee));
//                }
                fee = applyOrder.getFee();
                f.setFee(applyOrder.getFee());
                double number = strongLevelCalculationService.countSheets(f.getDepositOpen().doubleValue(), applyOrder.getLeverRate().intValue(), 0.01, realtime.getClose().doubleValue());
                f.setVolumeOpen(new BigDecimal(number));
                f.setVolume(new BigDecimal(number));
@@ -600,11 +602,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));