1

zj

12 hours ago b28a97e1bf66e3279e78f31ce58122427787ceec

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

@@ -197,11 +197,7 @@
        BigDecimal forceClose;
        if (order_close_line_type == 1) {
            Wallet wallet = this.walletService.findByUserId(order.getPartyId().toString());
            if (wallet == null) {
                forceClose = calculateType2ForceClosePrice(order);
            } else {
                forceClose = calculateType1ForceClosePrice(order, wallet);
            }
            forceClose = calculateType1ForceClosePrice(order, wallet);
        } else {
            forceClose = calculateType2ForceClosePrice(order);
        }
@@ -244,9 +240,6 @@
        List<ContractOrder> list = contractOrderService.findSubmitted(order.getPartyId(), null, null, null, null, null);
        BigDecimal otherEquity = BigDecimal.ZERO;
        for (ContractOrder contractOrder : list) {
            if (contractOrder == null) {
                continue;
            }
            if (ContractOrder.STATE_SUBMITTED.equals(contractOrder.getState())) {
                contractOrderService.wrapProfit(contractOrder);
            }