零售获取用户名称

app-hd/controllers/AdminController.php

@@ -157,9 +157,10 @@ class AdminController extends BaseController
 			util::fail('获取用户信息失败');
 		}
 		Yii::info('小程序获取用户信息：' . $result);
-		$originalInfo = Json::decode($result);
+		$wxInfo = Json::decode($result);
 		$source = UserClass::$userSourceId['mini']['name'];
-		$admin = AdminService::replaceAdmin($originalInfo, $source);
+        $wxInfo['miniOpenId'] = $admin['miniOpenId'] ?? '';
+		$admin = AdminService::replaceAdmin($wxInfo, $source);
 		$adminId = $admin['id'];
 		$admin = AdminService::getAdminById($adminId);
 		util::success($admin);

app-hd/controllers/AuthController.php

@@ -191,6 +191,7 @@ class AuthController extends PublicController
         $arr = Json::decode($result);
         $sessionKey = isset($arr['session_key']) ? $arr['session_key'] : '';
         $openid = isset($arr['openid']) ? $arr['openid'] : '';
+        $unionId = isset($arr['unionid']) ?? '';
         $cacheKey = 'SHOP_MINI_SESSION_KEY_' . $openid;
         Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
         if (empty($openid)) {
@@ -201,7 +202,7 @@ class AuthController extends PublicController
         $userSource = UserClass::$userSourceId['mini']['name'];
         $admin = AdminService::getByMiniOpenId($openid);
         if (empty($admin)) {
-            $adminInfo = ['miniOpenId' => $openid, 'style' => 1];
+            $adminInfo = ['miniOpenId' => $openid, 'style' => 1, 'unionId' => $unionId];
             $admin = AdminService::replaceAdmin($adminInfo, $userSource);
             $adminId = $admin['id'];
         } else {

app-mall/controllers/AuthController.php

@@ -144,7 +144,6 @@ class AuthController extends PublicController
             util::fail('没有找到小程序的密钥');
         }
         $url = "https://api.weixin.qq.com/sns/jscode2session?appid={$appId}&secret={$appSecret}&js_code={$code}&grant_type=authorization_code";
-
         $curl = new curl\Curl();
         $result = $curl->get($url);
         $arr = Json::decode($result);
@@ -155,10 +154,8 @@ class AuthController extends PublicController
             util::fail('没有获取到小程序openId');
         }
         $unionId = isset($arr['unionid']) && !empty($arr['unionid']) ? $arr['unionid'] : '';
-
         $userInfo = ['miniOpenId' => $miniOpenId, 'unionId' => $unionId];
         $userSource = UserClass::$userSourceId['mini']['name'];
-
         $shopId = $this->shopId;
         $sjId = 0;
         if (!empty($shopId)) {

biz-ghs/admin/classes/AdminClass.php

@@ -240,7 +240,7 @@ class AdminClass extends BaseClass
         $unionId = isset($wxInfo['unionId']) && !empty($wxInfo['unionId']) ? $wxInfo['unionId'] : '';
         $unionAdmin = [];
         if (!empty($unionId)) {
-            $unionAdmin = self::getByUnionId($unionId);
+            //$unionAdmin = self::getByUnionId($unionId);
         }
         switch ($source) {
             case $adminSource['mini']['name']:

biz-hd/admin/classes/AdminClass.php

@@ -207,24 +207,24 @@ class AdminClass extends BaseClass
     }
 
     //创建以及更新用户 ssh 2020.2.7
-    public static function replaceAdmin($adminInfo, $source)
+    public static function replaceAdmin($wxInfo, $source)
     {
-        $adminInfo = self::switchAdminInfo($adminInfo, $source);
+        $wxInfo = self::switchAdminInfo($wxInfo, $source);
         $adminSource = UserClass::$userSourceId;
-        $unionId = isset($adminInfo['unionId']) && !empty($adminInfo['unionId']) ? $adminInfo['unionId'] : '';
+        $unionId = isset($wxInfo['unionId']) && !empty($wxInfo['unionId']) ? $wxInfo['unionId'] : '';
         $unionAdmin = [];
         if (!empty($unionId)) {
-            $unionAdmin = self::getByUnionId($unionId);
+            //$unionAdmin = self::getByUnionId($unionId);
         }
         switch ($source) {
             case $adminSource['mini']['name']:
                 $sourceId = $adminSource['mini']['id'];
-                $miniOpenId = $adminInfo['miniOpenId'];
+                $miniOpenId = $wxInfo['miniOpenId'];
                 $admin = self::getByMiniOpenId($miniOpenId);
                 break;
             case $adminSource['official']['name']:
                 $sourceId = $adminSource['official']['id'];
-                $openId = isset($adminInfo['openId']) ? $adminInfo['openId'] : '';
+                $openId = isset($wxInfo['openId']) ? $wxInfo['openId'] : '';
                 $admin = [];
                 if (!empty($openId)) {
                     $admin = self::getByOpenId($openId);
@@ -237,13 +237,13 @@ class AdminClass extends BaseClass
             if (!empty($unionAdmin)) {
                 //1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
                 //2、关注了公众号或者H5已经授权时，并首次访问小程序
-                $admin = self::updateAdmin($unionAdmin, $adminInfo);
+                $admin = self::updateAdmin($unionAdmin, $wxInfo);
             } else {
-                $adminInfo['sourceType'] = $sourceId;
-                $admin = self::generateAdmin($adminInfo);
+                $wxInfo['sourceType'] = $sourceId;
+                $admin = self::generateAdmin($wxInfo);
             }
         } else {
-            $admin = self::updateAdmin($admin, $adminInfo);
+            $admin = self::updateAdmin($admin, $wxInfo);
         }
         return $admin;
     }
@@ -366,7 +366,7 @@ class AdminClass extends BaseClass
             }
         }
         if (isset($info['nickName'])) {
-            $info['nickName'] = $info['nickName'];
+            $info['name'] = $info['nickName'];
         }
         if (isset($info['unionid'])) {
             $info['unionId'] = $info['unionid'];

biz-hd/admin/services/AdminService.php

@@ -136,9 +136,9 @@ class AdminService extends BaseService
     }
 
     //添加更新客户 ssh 2020.2.7
-    public static function replaceAdmin($adminInfo, $source)
+    public static function replaceAdmin($wxInfo, $source)
     {
-        return AdminClass::replaceAdmin($adminInfo, $source);
+        return AdminClass::replaceAdmin($wxInfo, $source);
     }
 
     //取消关注 ssh 2020.4.19