1

zj

2025-10-30 14c1946eae86a86f8d1edee6cf3bdaf7572fc966

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

@@ -526,7 +526,7 @@
        BigDecimal point = close.subtract(order.getTradeAvgPrice());
        BigDecimal profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
        BigDecimal rentalProfit = order.getDeposit().add(profit);
        BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
        BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.DOWN);
        order.setAmountClose(order.getAmountClose().add(profit));
        order.setVolume(order.getVolume().subtract(volume));
        order.setDeposit(order.getDeposit().subtract(order.getDepositOpen().multiply(rate)));
@@ -584,8 +584,8 @@
                        , Constants.MONEYLOG_CATEGORY_CONTRACT, Constants.WALLET_USDT, Constants.MONEYLOG_CONTENT_FEE, "委托单，订单号[" + f.getOrderNo() + "]"
                );
            }
            //计算强平价格
            getStrongPrice(f,item);
//            //计算强平价格
//            getStrongPrice(f,item);
            update(f);
            refreshOrder(applyOrder, f);
        }else{
@@ -616,8 +616,8 @@
                        , Constants.MONEYLOG_CATEGORY_CONTRACT, Constants.WALLET_USDT, Constants.MONEYLOG_CONTENT_FEE, "委托单，订单号[" + order.getOrderNo() + "]"
                );
            }
            //计算强平价格
            getStrongPrice(order,item);
//            //计算强平价格
//            getStrongPrice(order,item);
            save(order);
            refreshOrder(applyOrder, order);
        }
@@ -803,13 +803,13 @@
        map.put("trade_avg_price", order.getTradeAvgPrice());
        map.put("close_avg_price", order.getCloseAvgPrice());
        if (order.getStopPriceProfit() != null) {
            map.put("stop_price_profit", order.getStopPriceProfit().setScale(4, RoundingMode.HALF_UP));
            map.put("stop_price_profit", order.getStopPriceProfit().setScale(4, RoundingMode.DOWN));
        }else{
            map.put("stop_price_profit", order.getStopPriceProfit());

        }
        if (order.getStopPriceLoss() != null) {
            map.put("stop_price_loss", order.getStopPriceLoss().setScale(4, RoundingMode.HALF_UP));
            map.put("stop_price_loss", order.getStopPriceLoss().setScale(4, RoundingMode.DOWN));
        }else{
            map.put("stop_price_loss", order.getStopPriceLoss());
        }
@@ -819,10 +819,10 @@
        map.put("fee", order.getFee());
        map.put("deposit", order.getDeposit());
        map.put("deposit_open", order.getDepositOpen());
        map.put("change_ratio", order.getChangeRatio().setScale(2, RoundingMode.HALF_UP));
        map.put("change_ratio", order.getChangeRatio().setScale(2, RoundingMode.DOWN));

        if(order.getProfit()!=null){
            map.put("profit", order.getProfit().setScale(2, RoundingMode.HALF_UP));
            map.put("profit", order.getProfit().setScale(2, RoundingMode.DOWN));
        }else{
            map.put("profit", order.getProfit());
        }