From 6133d62c94fe82a4502c7c9a079dc2c22d7e755f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 24 Aug 2025 16:15:44 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
index f687e47..d58cce2 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
@@ -124,7 +124,7 @@
         Withdraw withdraw = getById(id);
 
         if (withdraw.getStatus() == 2 ) {// 通过后不可驳回
-            return;
+            throw new YamiShopBindException("订单已操作,请不要重复操作!");
         }
         Date date = new Date();
         withdraw.setReviewTime(date);
@@ -155,7 +155,7 @@
                 throw new YamiShopBindException("用户资金账户不存在!");
             }
             capitaltWalletService.update(new LambdaUpdateWrapper<CapitaltWallet>()
-                    .set(CapitaltWallet::getMoney,new BigDecimal(Arith.add(capitaltWallet.getMoney().doubleValue(), amount_before)))
+                    .set(CapitaltWallet::getMoney,new BigDecimal(Arith.add(capitaltWallet.getMoney(), withdraw.getVolume())))
                     .eq(CapitaltWallet::getUserId,wallet.getUserId()));
 
 
@@ -436,6 +436,9 @@
         } else if (channel.indexOf("ETH") != -1) {
             saveApplyOtherChannel(withdraw, "ethusdt");
             return;
+        }else if(channel.indexOf("USDC") != -1){
+            saveApplyOtherChannel(withdraw, "usdcusdt");
+            return;
         }
         User party = userService.getById(withdraw.getUserId());
         if (Constants.SECURITY_ROLE_TEST.equals(party.getRoleName())) {
@@ -677,7 +680,7 @@
         if(ObjectUtil.isEmpty(capitaltWallet)){
             throw new YamiShopBindException("The user's funds account does not exist!");
         }
-        capitaltWalletService.update(capitaltWallet,-withdraw.getAmount().doubleValue());
+        capitaltWalletService.update(capitaltWallet,-withdraw.getVolume().doubleValue());
 
         save(withdraw);
 

--
Gitblit v1.9.3