1

zj

2025-08-14 c5b488df437af1edb49daec97b5e7b04b7c6328e

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

@@ -280,7 +280,6 @@
            BigDecimal profit = settle(order, order.getVolume());

            Wallet wallet = walletService.findByUserId(order.getPartyId());

            if (wallet.getMoney().add(profit).compareTo(BigDecimal.ZERO) < 0) {
                // 如果结果是负数，就归零
                if (wallet.getMoney().compareTo(BigDecimal.ZERO) < 0) {
@@ -526,6 +525,9 @@
        BigDecimal close = realtime.getClose();
        BigDecimal point = close.subtract(order.getTradeAvgPrice());
        BigDecimal profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
        if(null != order.getProfitLossRatio()   || order.getProfitLossRatio() > 0){
            profit = order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN);
        }
        BigDecimal rentalProfit = order.getDeposit().add(profit);
        BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
        order.setAmountClose(order.getAmountClose().add(profit));
@@ -782,7 +784,7 @@
        }
        map.put("name", name);
        map.put("symbol", order.getSymbol());
        map.put("create_time", DateUtils.format(order.getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
        map.put("create_time", order.getCreateTime());
        map.put("create_time_ts", order.getCreateTimeTs());

        if (order.getCloseTime() != null) {