用户信息

app-mall/controllers/AuthController.php

@@ -17,10 +17,6 @@ use common\components\wxUtil;
 use linslin\yii2\curl;
 use yii\helpers\Json;
 
-/**
- * 微信 oauth 授权相关
- *
- */
 class AuthController extends PublicController
 {
 
@@ -53,7 +49,8 @@ class AuthController extends PublicController
         if (empty($phoneNumber)) {
             util::fail('登录失败了');
         }
-        util::success(['mobile' => $phoneNumber]);
+        $params = ['mobile' => $phoneNumber];
+        util::success($params);
     }
 
     //准备授权 ssh 2019.11.19

app-mall/controllers/UserController.php

@@ -4,6 +4,7 @@ namespace mall\controllers;
 
 use bizHd\custom\classes\CustomClass;
 use bizHd\shop\classes\ShopClass;
+use bizHd\wx\classes\WxOpenClass;
 use bizMall\merchant\services\MerchantExtendService;
 use bizMall\message\services\SmsService;
 use bizMall\user\classes\UserClass;
@@ -49,12 +50,11 @@ class UserController extends BaseController
         $post = Yii::$app->request->post();
         $iv = isset($post['iv']) ? $post['iv'] : '';
         $encryptedData = isset($post['encryptedData']) ? $post['encryptedData'] : '';
-        $sjWx = $this->sjWx;
-        $appId = $sjWx['miniAppId'];
-        $sjId = $this->sjId;
-        $miniOpenId = $this->user['miniOpenId'];
+        $merchant = WxOpenClass::getMallWxMiniBase();
+        $appId = $merchant['miniAppId'];
+        $miniOpenId = $post['miniOpenId'];
         if (empty($miniOpenId)) {
-            util::fail('mini_open_id empty');
+            util::fail('没有miniOpenId');
         }
         $cacheKey = 'MALL_MINI_SESSION_KEY_' . $miniOpenId;
         $sessionKey = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
@@ -68,11 +68,7 @@ class UserController extends BaseController
         }
         Yii::info('小程序获取用户信息：' . $result);
         $originalInfo = Json::decode($result);
-        //新接口没有openId这边补一下，以免后面的流程报错
-        $originalInfo['miniOpenId'] = $miniOpenId;
-        $source = UserClass::$userSourceId['mini']['name'];
-        $user = UserClass::replaceUser($originalInfo, $source, $sjId, $this->shopId);
-        util::success($user);
+        util::success($originalInfo);
     }
 
     //小程序用户手机号
@@ -81,14 +77,11 @@ class UserController extends BaseController
         $post = Yii::$app->request->post();
         $iv = $post['iv'];
         $encryptedData = $post['encryptedData'];
-        $sjWx = $this->sjWx;
-        $appId = $sjWx['miniAppId'];
-        $user = isset($this->user->attributes) ? $this->user->attributes : [];
-        $miniOpenId = $user['miniOpenId'];
-        $customId = $this->customId;
-        $info = CustomClass::getCustomInfo($customId);
-        if (isset($info['mobile']) && !empty($info['mobile'])) {
-            util::success(['mobile' => $info['mobile']]);
+        $merchant = WxOpenClass::getMallWxMiniBase();
+        $appId = $merchant['miniAppId'];
+        $miniOpenId = $post['miniOpenId'];
+        if (empty($miniOpenId)) {
+            util::fail('没有miniOpenId');
         }
         $cacheKey = 'MALL_MINI_SESSION_KEY_' . $miniOpenId;
         $sessionKey = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
@@ -107,7 +100,6 @@ class UserController extends BaseController
         if (empty($mobile)) {
             util::fail('没有取到手机号，请重试');
         }
-        CustomClass::updateCustomInfo($info, ['mobile' => $mobile]);
         util::success(['mobile' => $mobile]);
     }
 

biz-mall/user/classes/UserClass.php

@@ -11,6 +11,7 @@ use bizMall\message\classes\ChatClass;
 use bizMall\user\services\UserIntegralService;
 use common\components\business;
 use common\components\dict;
+use common\components\stringUtil;
 use common\components\util;
 use common\components\wxUtil;
 use common\services\ImageService;
@@ -487,9 +488,17 @@ class UserClass extends BaseClass
     }
 
     //创建以及更新用户 ssh 2020.2.7
-    public static function replaceUser($userInfo, $source, $sjId, $shopId = 0)
+    public static function replaceUser($info)
     {
-
+        $mobile = $info['mobile'] ?? '';
+        if (stringUtil::isMobile($mobile) == false) {
+            util::fail('手机号错误');
+        }
+        $user = self::getByCondition(['mobile' => $mobile], true);
+        if (empty($user)) {
+            $user = self::add(['mobile' => $mobile], true);
+        }
+        return $user;
     }
 
     //拉取粉丝 ssh 2020.2.7