更新

app-ghs/controllers/AuthController.php

@@ -93,7 +93,7 @@ class AuthController extends PublicController
         }
         $openId = $data['openid'];
         $access_token = $data['access_token'];
-        $user = UserService::getByOpenId($openId, $sjId);
+        $user = UserService::getByOpenId($openId);
         //用户来源
         $userSource = Yii::$app->dict->getValue('userSourceGetId', 'official');
         $source = $userSource['name'];

app-hd/controllers/AuthController.php

@@ -93,7 +93,7 @@ class AuthController extends PublicController
         }
         $openId = $data['openid'];
         $access_token = $data['access_token'];
-        $user = UserService::getByOpenId($openId, $sjId);
+        $user = UserService::getByOpenId($openId);
         //用户来源
         $userSource = Yii::$app->dict->getValue('userSourceGetId', 'official');
         $source = $userSource['name'];

app-mall/controllers/AuthController.php

@@ -87,7 +87,7 @@ class AuthController extends PublicController
         }
         $openId = $data['openid'];
         $access_token = $data['access_token'];
-        $user = UserService::getByOpenId($openId, $sjId);
+        $user = UserService::getByOpenId($openId);
         //用户来源
         $userSource = Yii::$app->dict->getValue('userSourceGetId', 'official');
         $source = $userSource['name'];

app-pt/controllers/WxController.php

@@ -171,6 +171,7 @@ class WxController extends PublicController
                 }
             }
         } elseif ($style == dict::getDict('ptStyle', 'mall')) {
+            Yii::info(33333);
             //商城
             if ($this->msgType == 'event') {
                 switch ($Event) {
@@ -210,7 +211,7 @@ class WxController extends PublicController
                 $sjId = $merchant['id'];
                 $merchantExtend = xhMerchantExtendService::getBySjId($sjId);
             }
-            $user = xhUserService::getByOpenId($this->fromUsername, $sjId);
+            $user = xhUserService::getByOpenId($this->fromUsername);
             $userId = 0;
             $userAsset = [];
             if (!empty($user)) {

biz-hd/user/classes/UserClass.php

@@ -203,9 +203,9 @@ class UserClass extends BaseClass
         return self::getByCondition(['sjId' => $sjId, 'alipayId' => $alipayId]);
     }
 
-    public static function getByOpenId($openId, $sjId)
+    public static function getByOpenId($openId)
     {
-        return self::getByCondition(['sjId' => $sjId, 'openId' => $openId]);
+        return self::getByCondition(['openId' => $openId]);
     }
 
     public static function getByUnionId($unionId)

biz-hd/user/services/UserService.php

@@ -66,9 +66,9 @@ class UserService extends BaseService
         return UserClass::replaceUser($userInfo, $source, $sjId);
     }
 
-    public static function getByOpenId($openId, $sjId)
+    public static function getByOpenId($openId)
     {
-        return UserClass::getByOpenId($openId, $sjId);
+        return UserClass::getByOpenId($openId);
     }
 
     public static function getByMiniOpenId($miniOpenId)

biz-mall/user/services/UserService.php

@@ -58,9 +58,9 @@ class UserService extends BaseService
 		return UserClass::getByMobile($mobile, $sjId);
 	}
 
-	public static function getByOpenId($openId, $sjId)
+	public static function getByOpenId($openId)
 	{
-		return UserClass::getByOpenId($openId, $sjId);
+		return UserClass::getByOpenId($openId);
 	}
 	
 	public static function getByMiniOpenId($miniOpenId)

common/services/xhUserService.php

@@ -208,9 +208,9 @@ class xhUserService
 	/**
 	 * 获取用户信息
 	 */
-	public static function getByOpenId($openId, $sjId)
+	public static function getByOpenId($openId)
 	{
-		$user = xhUser::find()->where(['sjId' => $sjId, 'openId' => $openId])->asArray()->one();
+		$user = xhUser::find()->where(['openId' => $openId])->asArray()->one();
 		return $user;
 	}