From 1699f3441bcae0066c8cf99d7760239569e219db Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 26 Sep 2025 18:45:18 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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..b132fc4 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);
@@ -135,10 +135,12 @@
 
         String symbol = "";
         if (withdraw.getMethod().indexOf("BTC") != -1) {
-            symbol = "btc";
+                symbol = "btcusdt";
         } else if (withdraw.getMethod().indexOf("ETH") != -1) {
-            symbol = "eth";
-        } else {
+            symbol = "ethusdt";
+        } else if(withdraw.getMethod().indexOf("USDC") != -1){
+            symbol = "usdcusdt";
+        }else {
             symbol = "usdt";
         }
         if ("usdt".equals(symbol)) {
@@ -155,7 +157,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()));
 
 
@@ -210,7 +212,6 @@
         logService.save(log);
         tipService.deleteTip(withdraw.getUuid().toString());
     }
-
     @Override
     public long waitCount() {
         return count(Wrappers.<Withdraw>query().lambda().eq(Withdraw::getStatus, 0));
@@ -435,6 +436,9 @@
             return;
         } 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());
@@ -677,7 +681,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