Wesmiler

app/Http/Controllers/Api/v1/MemberController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Api\webApp;
 use App\Services\Api\MemberService;
-use App\Services\RedisService;
 use Illuminate\Http\Request;
 
 /**

app/Services/Api/MemberService.php

@@ -74,13 +74,6 @@ class MemberService extends BaseService
             return false;
         }
 
-        // 敏感数据
-//        $signData = isset($params['userInfo'])?$params['userInfo']:[];
-//        $encryptedData = isset($signData['encryptedData'])?$signData['encryptedData']:'';
-//        $iv = isset($signData['iv'])?$signData['iv']:'';
-//        $signature = isset($signData['signature'])?$signData['signature']:'';
-//        $rawData = isset($signData['rawData'])?$signData['rawData']:'';
-
         // 获取用户信息
         $result = MpService::make()->getUserInfo($code);
         $openid = isset($result['openid']) ? $result['openid'] : '';
@@ -193,7 +186,11 @@ class MemberService extends BaseService
         return $result;
     }
 
-
+    /**
+     * 完善资料
+     * @param $params
+     * @return array|false
+     */
     public function setProfile($params)
     {
         $id = isset($params['id'])? $params['id'] : 0;
@@ -280,62 +277,6 @@ class MemberService extends BaseService
     }
 
     /**
-     * 设置资料
-     * @param $userId
-     * @param $params
-     * @return bool
-     */
-    public function setEntry($userId, $params)
-    {
-        $cacheLockKey = "caches:members:profile_{$userId}";
-        if (RedisService::get($cacheLockKey)) {
-            $this->error = 1034;
-            return false;
-        }
-
-        // 用户验证
-        RedisService::set($cacheLockKey, ['user_id' => $userId, 'params' => $params], rand(2, 3));
-        $info = $this->model->where(['id' => $userId, 'mark' => 1])
-            ->select(['id', 'password', 'status'])
-            ->first();
-        if (!$info || $info['status'] != 1) {
-            $this->error = 1043;
-            RedisService::clear($cacheLockKey);
-            return false;
-        }
-
-        // 获取头像
-        $avatar = '';
-        if (isset($params['avatar']) && $params['avatar']) {
-            $avatar = save_base64_image($params['avatar'], 'avatar');
-        }
-
-        //
-        $data = [
-            'avatar' => $avatar,
-            'nickname' => isset($params['nickname']) ? trim($params['nickname']) : '',
-            'update_time' => time()
-        ];
-
-        if (isset($params['province']) && $params['city']) {
-            $data['province'] = isset($params['province']) ? trim($params['province']) : '';
-            $data['city'] = isset($params['city']) ? trim($params['city']) : '';
-            $data['district'] = isset($params['district']) ? trim($params['district']) : '';
-        }
-
-        if (!$this->model->where(['id' => $userId])->update($data)) {
-            $this->error = 1020;
-            RedisService::clear($cacheLockKey);
-            return false;
-        }
-
-        $this->error = 1019;
-        RedisService::clear($cacheLockKey);
-        return true;
-    }
-
-
-    /**
      * 获取资料详情
      * @param $where
      * @param array $field
@@ -353,7 +294,7 @@ class MemberService extends BaseService
             return $info;
         }
 
-        $defaultField = ['id', 'user_type', 'realname', 'mobile', 'nickname', 'balance', 'code', 'openid', 'status', 'avatar'];
+        $defaultField = ['id', 'user_type', 'realname', 'mobile','idcard_check', 'nickname', 'balance', 'code', 'openid', 'status', 'avatar'];
         $field = $field ? $field : $defaultField;
         if (is_array($where)) {
             $info = $this->model->where(['mark' => 1])->where($where)->select($field)->first();
@@ -371,28 +312,11 @@ class MemberService extends BaseService
                 $info['mobile_text'] = $info['mobile'] ? format_mobile($info['mobile']) : '';
             }
 
-            if (isset($info['create_time'])) {
-                $info['create_at'] = datetime(strtotime($info['create_time']));
-            }
-
-            $info['store'] = isset($info['store']) ? $info['store'] : [];
-            $info['agent'] = isset($info['agent']) ? $info['agent'] : [];
-
-            $info['agent_level'] = 0;
-            $info['team_count'] = 0;
             $params = request()->all();
             $type = isset($params['type'])?$params['type']:'';
-            if ($type == 'agent' && $info['agent']) {
-                $info['agent_level'] = $this->getAgentLevel($info['id']);
-                $info['agent_level'] = $info['agent_level']>=2?2 : 1;
-                $info['team_count'] = $this->getTeamCount($info['id']);
-            }
-
-            if($type == 'agent'){
+            if($type == 'qrcode'){
                 $info['qrcode'] = MpService::make()->getMiniQrcode('pages/login/login',"rid={$info['id']}");
                 $info['qrcode'] = $info['qrcode']? get_image_url($info['qrcode']):'';
-            }else if($type == 'center'){
-                $info['order1'] = OrderService::make()->getCountByStatus($info['id'], 1);
             }
 
             RedisService::set($cacheKey, $info, rand(30, 60));

routes/api.php

@@ -54,7 +54,6 @@ Route::prefix('v1')->middleware('web.login')->group(function() {
 
     // 用户信息
     Route::get('/user/info', [\App\Http\Controllers\Api\v1\MemberController::class, 'info']);
-    Route::post('/user/setEntry', [\App\Http\Controllers\Api\v1\MemberController::class, 'setEntry']);
     Route::post('/user/account', [\App\Http\Controllers\Api\v1\MemberController::class, 'account']);
     Route::post('/user/bindAccount', [\App\Http\Controllers\Api\v1\MemberController::class, 'bindAccount']);
     Route::post('/user/modify', [\App\Http\Controllers\Api\v1\MemberController::class, 'modify']);