1

app/common/repositories/user/UserRepository.php

@@ -502,7 +502,7 @@ class UserRepository extends BaseRepository
      * @author xaboy
      * @day 2020-04-28
      */
-    public function syncWechatUser(WechatUser $wechatUser, $userType = 'wechat',$order_id)
+    public function syncWechatUser(WechatUser $wechatUser, $userType = 'wechat')
     {
         $user = $this->dao->wechatUserIdBytUser($wechatUser->wechat_user_id);
         $request = request();
@@ -528,7 +528,7 @@ class UserRepository extends BaseRepository
                 'sex' => $wechatUser['sex'] ?? 0,
                 'spread_uid' => 0,
                 'is_promoter' => 0,
-                'order_id' => $order_id,
+                'order_id' => $wechatUser['order_id'] ?? 0,
                 'last_time' => date('Y-m-d H:i:s'),
                 'last_ip' => $request->ip()
             ]);

app/common/repositories/wechat/WechatUserRepository.php

@@ -60,7 +60,7 @@ class WechatUserRepository extends BaseRepository
      * @author xaboy
      * @day 2020-04-28
      */
-    public function syncUser(string $openId, array $userInfo, bool $mode = false, $createUser = true, $order_id = 0)
+    public function syncUser(string $openId, array $userInfo, bool $mode = false, $createUser = true)
     {
         if (($mode && (!isset($userInfo['subscribe']) || !$userInfo['subscribe'])) || !isset($userInfo['openid']))
             return;
@@ -77,7 +77,7 @@ class WechatUserRepository extends BaseRepository
             $userInfo['tagid_list'] = implode(',', $userInfo['tagid_list']);
         }
 
-        return Db::transaction(function () use ($createUser, $mode, $userInfo, $wechatUser,$order_id) {
+        return Db::transaction(function () use ($createUser, $mode, $userInfo, $wechatUser) {
             if ($wechatUser) {
                 if ($mode) {
                     unset($userInfo['nickname']);
@@ -89,7 +89,7 @@ class WechatUserRepository extends BaseRepository
             if (!$createUser) return [$wechatUser];
             /** @var UserRepository $userRepository */
             $userRepository = app()->make(UserRepository::class);
-            $user = $userRepository->syncWechatUser($wechatUser,'wechat',$order_id);
+            $user = $userRepository->syncWechatUser($wechatUser,'wechat');
             return [$wechatUser, $user];
         });
     }

app/controller/api/Auth.php

@@ -209,7 +209,8 @@ class Auth extends BaseController
         /** @var WechatUserRepository $make */
         $make = app()->make(WechatUserRepository::class);
         $order_id = $this->request->param('order_id', 0);
-        $user = $make->syncUser($wechatInfo['openid'], $wechatInfo, false,true,$order_id);
+        $wechatInfo['order_id'] = $order_id;
+        $user = $make->syncUser($wechatInfo['openid'], $wechatInfo);
         if (!$user)
             return app('json')->fail('授权失败[003]');
         /** @var UserRepository $make */