Merge branch 'wx_user_20210929' into develop

application/services/user/UserService.php

@@ -316,7 +316,12 @@ class UserService
 
         $phoneNumber = strval($decryptData['phoneNumber']);
         //判断是否已
-        $user = UserWechatBind::getRecordMaster(['phone' => $phoneNumber]);
+        if ($params['appid'] == 'merchant-pub-pin') {
+            $user = UserWechatBind::getRecordMaster(['phone' => $phoneNumber]);
+        }else{
+            $user = UserWechatBind::getRecordMaster(['phone' => $phoneNumber,'wechat_app_id' => self::$appid]);
+        }
+        
         if (!empty($user) &&  $openid != $user['openid']) {
             FileLog::error("bindPhone：该手机号已绑定其他用户不能重复绑定", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
             FileLog::error("bindPhone：该手机号已绑定其他用户不能重复绑定--user", json_encode($user, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');