Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/user/UserRepository.php

@@ -3199,7 +3199,7 @@ class UserRepository extends BaseRepository
     /*微信登录验证
      $openid 微信openid
     */
-    public  function  wechatCheck($openid){
+    public  function  wechatCheck($openid, $nickname = '', $headimgurl = ''){
         $user = Db::name("user")->where(['wechat_user_id'=>$openid])->find();
         //判断是否是第一次登录
         if($user){
@@ -3207,6 +3207,33 @@ class UserRepository extends BaseRepository
             if (!$user['account']) {
                 return ['code' => 400, 'msg' => '请绑定手机号'];
             } else {
+                $existUid = Db::name('user_extract_openid')->where('openid', $openid)->value('uid');
+                if (!empty($existUid) && $existUid != $user['uid']) {
+                    return ['code' => 400, 'msg' => '此微信号已被绑定'];
+                }
+                $check = Db::name('user_extract_openid')->where('uid', $user['uid'])->value('openid');
+                if (!empty($check)) {
+                    if ($check != $openid) {
+                        return ['code' => 400, 'msg' => '当前用户已绑定其他微信号'];
+                    }
+                } else {
+                    Db::name("user_extract_openid")->insert([
+                        'uid' => $user['uid'],
+                        'openid' => $openid,
+                        'type' => 1
+                    ]);
+                }
+                $this->updateUser(
+                    $user['uid'],
+                    ['wechat_user_id' => $openid],
+                    [
+                        "type" => 1,
+                        "uid" => $user['uid'],
+                        "nickname" => $nickname,
+                        "avater" => $headimgurl,
+                    ]
+                );
+
                 return ['code' => 200, 'msg' => '登陆成功', 'user' => $user];
             }
         }else{

app/controller/api/Auth.php

@@ -1629,7 +1629,7 @@ class Auth extends BaseController
 
     /*微信授权登录*/
     public function wechatCheck(){
-        $data =  $this->request->params(['openid']);
+        $data =  $this->request->params(['openid', 'nickname', 'avatar']);
         if(!$data['openid'] || $data['openid'] == '' || $data['openid'] =='undefined'){
             return app('json')->fail("openid参数缺失");
         }
@@ -1638,7 +1638,7 @@ class Auth extends BaseController
         if($this->source=='yhc'){
             $result =  $repository ->wechatCheckYhc($data['openid']);
         }else{
-            $result =  $repository ->wechatCheck($data['openid']);
+            $result =  $repository ->wechatCheck($data['openid'], $data['nickname'], $data['avatar']);
         }
         if(isset($result['code']) && $result['code'] == 200){
             $user = $repository->accountByUser($result['user']['account']);

app/controller/api/user/User.php

@@ -2656,12 +2656,15 @@ class User extends BaseController
                 $existUid = Db::name('user_extract_openid')->where('openid',$unionId)->value('uid');
                 if (!empty($existUid) && $existUid != $uid) throw new \Exception("此微信号已被绑定");
                 $check = Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
-                if (!empty($check) && $check != $unionId) throw new \Exception("当前用户已绑定其他微信号");
-                Db::name("user_extract_openid")->insert([
-                    'uid' => $uid,
-                    'openid' => $unionId,
-                    'type' => 1
-                ]);
+                if (!empty($check)){
+                    if ($check != $unionId) throw new \Exception("当前用户已绑定其他微信号");
+                } else {
+                    Db::name("user_extract_openid")->insert([
+                        'uid' => $uid,
+                        'openid' => $unionId,
+                        'type' => 1
+                    ]);
+                }
             } else {
                 $alinfo = json_decode($alinfo, true);
                 if (!$alinfo) throw new \Exception("参数异常");

config/database.php

@@ -33,7 +33,7 @@ return [
             // 数据库连接参数
             'params'            => [],
             // 数据库编码默认采用utf8
-            'charset'           => env('database.charset', 'utf8'),
+            'charset'           => env('database.charset', 'utf8mb4'),
             // 数据库表前缀
             'prefix'            => env('database.prefix', ''),