From 8b1691d624b932a8029d9918ad4e3f39832275e5 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 13 Mar 2024 09:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 3ac09721..1967f345 100755
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1717,22 +1717,6 @@ class Auth extends BaseController
         if (!empty($user)) {
             Db::startTrans();
             try {
-                StoreGroupOrder::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                StoreOrder::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                StoreOrderProduct::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                UserBill::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                FinancialRecord::where('user_id', $user['uid'])->update(['user_id' => $targetUser['uid']]);
-                UserAddress::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                StoreConsumptionUser::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                StoreConsumptionDetail::where('user_id', $user['uid'])->update(['user_id' => $targetUser['uid']]);
-                StoreRefundOrder::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                UserRecharge::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                StoreOrderStatus::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
-                if ($user->now_money > 0) {
-                    $targetUser->now_money = bcadd($targetUser->now_money, $user->now_money, 2);
-                    $user->now_money = 0;
-                    $targetUser->save();
-                }
                 $merchant = Merchant::where('uid', $targetUser['uid'])->find();
                 if (!empty($merchant)) {
                     $orders = StoreOrder::with(['refundOrder' => function(Query $query) {
@@ -1767,6 +1751,22 @@ class Auth extends BaseController
                         $merchant->save();
                     }
                 }
+                StoreGroupOrder::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                StoreOrder::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                StoreOrderProduct::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                UserBill::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                FinancialRecord::where('user_id', $user['uid'])->update(['user_id' => $targetUser['uid']]);
+                UserAddress::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                StoreConsumptionUser::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                StoreConsumptionDetail::where('user_id', $user['uid'])->update(['user_id' => $targetUser['uid']]);
+                StoreRefundOrder::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                UserRecharge::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                StoreOrderStatus::where('uid', $user['uid'])->update(['uid' => $targetUser['uid']]);
+                if ($user->now_money > 0) {
+                    $targetUser->now_money = bcadd($targetUser->now_money, $user->now_money, 2);
+                    $user->now_money = 0;
+                    $targetUser->save();
+                }
                 $user->wechat_user_id = 0;
                 $user->main_uid = $targetUser['uid'];
                 $user->save();