From f5ec7fced5c4633281627977da3983f08f34cdc0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 23 May 2024 13:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8F=90=E7=8E=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=8F=8A=E5=95=86=E6=88=B7=E3=80=81=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E7=AD=89=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/withdraw/MerchantWithdrawLogic.php  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/admin/logic/withdraw/MerchantWithdrawLogic.php b/app/admin/logic/withdraw/MerchantWithdrawLogic.php
index 90d22f0..f01a5df 100644
--- a/app/admin/logic/withdraw/MerchantWithdrawLogic.php
+++ b/app/admin/logic/withdraw/MerchantWithdrawLogic.php
@@ -95,6 +95,20 @@ class MerchantWithdrawLogic extends BaseLogic
 				'fail_msg' => $params['fail_msg'] ?? '',
 				'admin_id' => $admin_id
 			]);
+			if($params['is_check'] == 2){
+				if (!empty($data['mer_id'])) {
+					$merchant = Merchant::where('mer_id', $data['mer_id'])->findOrEmpty();
+					$merchant->where('mer_id', $data['mer_id'])->update([
+						'mer_money' => bcadd($merchant['mer_money'], $data['amount'], 2)
+					]);
+				}
+				if (!empty($data['supplier_id'])) {
+					$supplier = Supplier::where('id', $data['supplier_id'])->findOrEmpty();
+					$supplier->where('id', $data['supplier_id'])->update([
+						'mer_money' => bcadd($supplier['mer_money'], $data['amount'], 2)
+					]);
+				}
+			}
 			Db::commit();
 			return true;
 		} catch (\Exception $e) {
@@ -133,18 +147,6 @@ class MerchantWithdrawLogic extends BaseLogic
 				'arrival_proof' => $params['arrival_proof'] ? json_encode($params['arrival_proof']) : null,
 				'arrival_user' => $admin_id
 			]);
-			if(!empty($data['mer_id'])){
-				$merchant = Merchant::where('mer_id',$data['mer_id'])->findOrEmpty();
-				$merchant->where('mer_id',$data['mer_id'])->update([
-					'mer_money' => bcsub($merchant['mer_money'],$data['amount'],2)
-				]);
-			}
-			if(!empty($data['supplier_id'])){
-				$supplier = Supplier::where('id',$data['supplier_id'])->findOrEmpty();
-				$supplier->where('id',$data['supplier_id'])->update([
-					'mer_money' => bcsub($supplier['mer_money'],$data['amount'],2)
-				]);
-			}
 			Db::commit();
 			return true;
 		} catch (\Exception $e) {