1

zj

2025-10-24 c759b55471f47af64a3c92a3666b0485af77c1ec

1

 trading-order-bean/src/main/java/com/yami/trading/bean/contract/domain/ContractOrder.java

@@ -20,7 +20,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_contract_order")
public class ContractOrder extends BaseEntity {
public class  ContractOrder extends BaseEntity {
    public final static String STATE_SUBMITTED = "submitted";
    public final static String STATE_CREATED = "created";
    /**

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

@@ -153,14 +153,9 @@
                    .ne(ContractOrder::getOrderNo, order.getOrderNo())
            );

            // 提前计算 currentPrice 与 order.getTradeAvgPrice() 的差值，避免重复计算
            BigDecimal priceDifference = currentPrice.subtract(order.getTradeAvgPrice());

            // 计算所有订单的收益
            // 计算所有订单的收益+保证金
            for (ContractOrder contractOrder : list) {
                BigDecimal profit = priceDifference
                        .multiply(new BigDecimal("0.01"))
                        .multiply(contractOrder.getVolumeOpen())
                BigDecimal profit = contractOrder.getProfit().add(contractOrder.getDepositOpen())
                        .setScale(4, RoundingMode.DOWN);

                earnings = earnings.add(profit);  // 累加收益

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

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