1

zyy3

2025-11-14 bf09786ee49251f54f78945856742d0a60eb1f28

1

 trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java

@@ -342,8 +342,10 @@
        // 如果是计划委托则不返回余额
        if (order.isTriggerOrder()) {
            if (ExchangeApplyOrder.OFFSET_OPEN.equals(order.getOffset())) {
                Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
                double amount_before = wallet.getMoney().doubleValue();
                //Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
                //double amount_before = wallet.getMoney().doubleValue();
                CapitaltWallet userIdWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
                double amount_before = userIdWallet.getMoney().doubleValue();
                MoneyLog moneylog = new MoneyLog();
                moneylog.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
                moneylog.setAmountBefore(new BigDecimal(amount_before));
@@ -378,16 +380,20 @@
        }
        if (!order.isTriggerOrder()) {
            if (ExchangeApplyOrder.OFFSET_OPEN.equals(order.getOffset())) {
                Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
                double amount_before = wallet.getMoney().doubleValue();
                //Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
                //double amount_before = wallet.getMoney().doubleValue();
//                wallet.setMoney(Arith.add(wallet.getMoney(), order.getVolume()));
//                walletService.update(wallet);
                walletService.update(wallet.getUserId().toString(), order.getVolume());
                //walletService.update(wallet.getUserId().toString(), order.getVolume());
                CapitaltWallet userIdWallet = capitaltWalletService.getUserIdWallet(order.getPartyId());
                double amount_before = userIdWallet.getMoney().doubleValue();
                capitaltWalletService.update(userIdWallet, order.getVolume());

                MoneyLog moneylog = new MoneyLog();
                moneylog.setCategory(Constants.MONEYLOG_CATEGORY_EXCHANGE);
                moneylog.setAmountBefore(new BigDecimal(amount_before));
                moneylog.setAmount(new BigDecimal(order.getVolume()));
                moneylog.setAmount_after(wallet.getMoney());
                moneylog.setAmountAfter(userIdWallet.getMoney());
                moneylog.setLog("币币交易撤单，订单号[" + order.getOrderNo() + "]");
                moneylog.setUserId(order.getPartyId());
                moneylog.setWalletType(Constants.WALLET);