全仓

zyy

2026-03-05 6fd35ed620c5cc01a69d72b9d4d0e93703638847

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

@@ -118,7 +118,7 @@
        Item item = itemService.findBySymbol(order.getSymbol());


        if(null != order.getProfitLossRatio()){//根据后台设置的盈亏比来
        if(null != order.getProfitLossRatio() && order.getProfitLossRatio() > 0){//根据后台设置的盈亏比来
            order.setProfit(order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN));
        }else{
            /*
@@ -128,7 +128,7 @@
             * 偏差点位
             */
            BigDecimal point = currentPrice.subtract(order.getTradeAvgPrice());
            BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
            BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);
            if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
                order.setProfit(amount);
            } else{
@@ -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,15 +166,17 @@
                        .setScale(4, RoundingMode.DOWN);

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

            // 获取当前账户余额并加到收益中
            Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());
            earnings = earnings.add(new BigDecimal(moneyAll.get("money_all_coin").toString()));
            //Map<String, Object> moneyAll = walletService.getMoneyAll(order.getPartyId());

            Wallet wallet = walletService.saveWalletByPartyId(order.getPartyId());
            earnings = earnings.add(wallet.getMoney());
            earnings = earnings.add(order.getDepositOpen());
        } else {
            // 如果不符合条件，直接使用 order.getDepositOpen() 作为收益
            earnings = order.getDepositOpen();
            earnings = order.getDepositOpen().add(order.getAddDepositOpen());
        }

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