全仓

zyy

2026-03-05 5e022aa541aaf781df8e66ac650cfdfb49e6c682

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

@@ -149,7 +149,7 @@
            earnings = BigDecimal.ZERO;

            // 统计非当前订单的其他收益
            List<ContractOrder> list = contractOrderService.list(new LambdaQueryWrapper<>(ContractOrder.class)
            /*List<ContractOrder> list = contractOrderService.list(new LambdaQueryWrapper<>(ContractOrder.class)
                    .eq(ContractOrder::getState, ContractOrder.STATE_SUBMITTED)
                    .eq(ContractOrder::getPartyId, order.getPartyId())
                    .ne(ContractOrder::getOrderNo, order.getOrderNo())
@@ -166,7 +166,7 @@
                        .setScale(4, RoundingMode.DOWN);

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

            // 获取当前账户余额并加到收益中
            Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
@@ -174,7 +174,7 @@
            earnings = earnings.add(order.getDepositOpen());
        } else {
            // 如果不符合条件，直接使用 order.getDepositOpen() 作为收益
            earnings = order.getDepositOpen();
            earnings = order.getDepositOpen().add(order.getAddDepositOpen());
        }

        if(ContractOrder.DIRECTION_BUY.equals(order.getDirection())){