全仓

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())){
@@ -264,29 +264,35 @@
//            if (profit.add(wallet.getMoney()).compareTo(BigDecimal.ZERO) <= 0) {
            //判断买涨还是买跌"buy":买(多) "sell":卖(空)
            if(order.getDirection().equals("buy")){
                if (currentPrice.toString().compareTo(order.getForceClosePrice()) <= 0) {//达到强平价
                if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
                    /**
                     * 触发全仓强平
                     */
                    log.info("------------------currentPrice-------------："+currentPrice);
                    log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
                    log.info("------------------开多强平-------------");
                    this.contractOrderService.allClose(order.getPartyId());

                }
            }else{
                if (currentPrice.toString().compareTo(order.getForceClosePrice())>= 0) {//达到强平价
                if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice()))>= 0) {//达到强平价
                    /**
                     * 触发全仓强平
                     */
                    log.info("------------------currentPrice-------------："+currentPrice);
                    log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
                    log.info("------------------开空强平-------------");
                    this.contractOrderService.allClose(order.getPartyId());

                }
            }
        } else {
            if(order.getDirection().equals("buy")){
                if (currentPrice.toString().compareTo(order.getForceClosePrice()) <= 0) {//达到强平价
                if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
                    this.contractOrderService.saveClose(order.getPartyId().toString(), order.getOrderNo(),"强平");
                }
            }else{
                if (currentPrice.toString().compareTo(order.getForceClosePrice()) >= 0) {//达到强平价
                if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) >= 0) {//达到强平价
                    this.contractOrderService.saveClose(order.getPartyId().toString(), order.getOrderNo(),"强平");
                }
            }