更新

app/Http/Controllers/Api/LoginController.php

@@ -5,7 +5,9 @@
 use App\Command\Log;
 use App\Command\Log;
 use App\Models\PersonalAccessToken;
 use App\Models\PersonalAccessToken;
 use App\Models\User;
 use App\Models\User;
+use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Hash;
 
 
 class LoginController extends BaseController
 class LoginController extends BaseController
@@ -115,13 +117,15 @@ public function merchantLogin(Request $request)
         $code = $request->code ?? '';
         $code = $request->code ?? '';
 
 
         if (!$code) {
         if (!$code) {
-            return $this->JsonResponse('', '无效参数Code', 201);
+            return $this->JsonResponse('', '参数Code不能为空', 201);
         }
         }
+        DB::beginTransaction();
+        try {
             $url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' . $appid . '&secret=' . $secret . '&js_code=' . $code . '&grant_type=authorization_code';
             $url = 'https://api.weixin.qq.com/sns/jscode2session?appid=' . $appid . '&secret=' . $secret . '&js_code=' . $code . '&grant_type=authorization_code';
             $result = json_decode(file_get_contents($url), true);
             $result = json_decode(file_get_contents($url), true);
             if (isset($result['errcode'])) {
             if (isset($result['errcode'])) {
                 Log::add('商户端授权请求微信接口异常', $result);
                 Log::add('商户端授权请求微信接口异常', $result);
-            return $this->JsonResponse('', '请求微信接口异常', 201);
+                throw new \Exception($result['errmsg']);
             }
             }
 
 
             $openId = $result['openid'];
             $openId = $result['openid'];
@@ -129,6 +133,11 @@ public function merchantLogin(Request $request)
                 $muser->openid = $openId;
                 $muser->openid = $openId;
                 $muser->save();
                 $muser->save();
             }
             }
+            DB::commit();
+        } catch (\Exception $exception) {
+            DB::rollBack();
+            return $this->JsonResponse('', $exception->getMessage(), 201);
+        }
 
 
         return $this->JsonResponse('');
         return $this->JsonResponse('');
     }
     }