Wesmiler

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

@@ -38,36 +38,6 @@ class MemberController extends webApp
     }
 
     /**
-     * 团队成员佣金订单
-     * @return array
-     */
-    public function bill()
-    {
-        try {
-            $params = request()->all();
-            $userId = isset($params['id']) && $params['id']>0?$params['id']:0;
-            if(!MemberService::make()->checkTeamPermission($this->userId, $userId)){
-                return showJson(MemberService::make()->getError(), false);
-            }
-
-            $date = isset($params['date']) ? $params['date'] : [];
-            $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00', time() - 30 *3 *86400);
-            if($start < date('Y-m-d', time() - 365 * 86400)){
-                return showJson('只能查询最近1年的记录', false);
-            }
-
-            if ($datas = OrderService::make()->getCommissionBill($userId?$userId:$this->userId,$params)) {
-                return showJson(1010, true, $datas);
-            } else {
-                return showJson( 1009, false);
-            }
-        } catch (\Exception $exception){
-            $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
-            return showJson(1046, false, $error);
-        }
-    }
-
-    /**
      * 信息
      * @return array
      */
@@ -90,21 +60,6 @@ class MemberController extends webApp
     }
 
     /**
-     * 认证资料
-     * @return array
-     */
-    public function authInfo()
-    {
-        $type = request()->post('type',0);
-        $info = MemberService::make()->authInfo($this->userId,$type);
-        if ($info) {
-            return showJson(1010, true, $info);
-        } else {
-            return showJson(1004, false, [], '403');
-        }
-    }
-
-    /**
      * 绑定收款账号
      * @return array
      */
@@ -139,30 +94,6 @@ class MemberController extends webApp
         }
     }
 
-    /**
-     * 认证
-     * @return array
-     */
-    public function auth(MemberValidator $validator)
-    {
-        $params = request()->all();
-        $params = $validator->check($params, 'auth');
-        if (!is_array($params)) {
-            return showJson($params, false);
-        }
-        try {
-
-            if (!$result = MemberService::make()->auth($this->userId, $params)) {
-                return showJson(MemberService::make()->getError(), false);
-            } else {
-                return showJson(MemberService::make()->getError(), true, $result);
-            }
-        } catch (\Exception $exception){
-            $error = ['data'=>$exception->getTrace(),'err'=>$exception->getMessage()];
-            return showJson(1046, false, $error);
-        }
-    }
-
 
     /**
      * 获取手机号

app/Services/Api/MemberService.php

@@ -593,58 +593,6 @@ class MemberService extends BaseService
     }
 
     /**
-     * 认证
-     * @param $userId
-     * @param $params
-     * @return bool
-     */
-    public function auth($userId, $params)
-    {
-        $cacheLockKey = "caches:members:auth_{$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', 'realname','idcard','is_auth', 'status'])
-            ->first();
-        if (!$info || $info['status'] != 1) {
-            $this->error = '账号或已被冻结，请联系客服';
-            RedisService::clear($cacheLockKey);
-            return false;
-        }
-
-        if($info['is_auth'] == 1 && $info['idcard'] && $info['realname']){
-            $this->error = '抱歉，您已完成认证';
-            RedisService::clear($cacheLockKey);
-            return false;
-        }
-
-        // 认证数据
-        $data = [
-            'realname'=> isset($params['realname'])?$params['realname'] : '',
-            'company'=> isset($params['company'])?$params['company'] : '',
-            'idcard'=> isset($params['idcard'])?$params['idcard'] : '',
-            'is_auth'=> 1,
-            'update_time' => time()
-        ];
-        if (!$this->model->where(['id' => $userId])->update($data)) {
-            $this->error = '认证提交失败';
-            RedisService::clear($cacheLockKey);
-            return false;
-        }
-
-        $this->error = '恭喜您，已完成认证';
-        RedisService::clear($cacheLockKey);
-        RedisService::clear("caches:members:authInfo:{$userId}");
-        RedisService::keyDel("caches:members:teamList*");
-        return true;
-    }
-
-    /**
      * 获取团队列表
      * @param $userId
      * @param $params
@@ -665,9 +613,8 @@ class MemberService extends BaseService
             ];
         }
 
-        $list = $this->model->with(['account'])->from('member as a')
-            ->leftJoin('account_statistics as b','b.user_id','=','a.id')
-            ->where(['a.parent_id'=>$userId,'b.state'=>1,'a.mark'=>1])
+        $list = $this->model->from('member as a')
+            ->where(['a.parent_id'=>$userId,'a.mark'=>1])
             ->where(function($query) use($params){
                 $keyword = isset($params['keyword'])? $params['keyword'] : '';
                 if($keyword){
@@ -696,58 +643,6 @@ class MemberService extends BaseService
 
     }
 
-    /**
-     * 设置账户参数
-     * @param $userId
-     * @param $params
-     * @return array|false|mixed|string
-     */
-    public function setting($userId, $params)
-    {
-        $apiUrl = ConfigService::make()->getConfigByCode('bonus_settle_url','');
-        if(empty($apiUrl)){
-            $this->error = '设置失败，参数错误';
-            return false;
-        }
-
-        $token = request()->headers->get('Authorization');
-        $token = str_replace("Bearer ", null, $token);
-        $header = [
-            'authorization: '.$token
-        ];
-        $position = isset($params['position'])?trim($params['position']): '';
-        $point = isset($params['commission_point'])?floatval($params['commission_point']): 0;
-        $result = httpRequest($apiUrl.'/team/setting',['id'=>$userId,'position'=>$position,'point'=>$point],'post','',5,$header);
-        $err = isset($result['err']) && $result['err']?$result['err'] : -1;
-        $msg = isset($result['msg']) && $result['msg']?$result['msg'] : '1003';
-        $data = isset($result['data']) && $result['data']?$result['data'] : [];
-        if($err==0){
-            $this->error = '操作成功';
-            return $data;
-        }else{
-            $this->error = $msg;
-            return false;
-        }
-    }
-
-    /**
-     * 验证操作用户权限
-     * @param $userId
-     * @param $actId
-     * @return bool
-     */
-    public function checkTeamPermission($userId, $actId)
-    {
-        $parents = $this->model->where(['id'=>$actId])->value('parents');
-        $parents = $parents? explode(',',$parents) : [];
-        if(!in_array($userId,$parents) && $actId != $userId){
-            $this->error = '信息错误，权限不足';
-            return false;
-        }
-
-        $this->error = '验证成功';
-        return true;
-    }
 
     /**
      * 账号注销

routes/api.php

@@ -62,12 +62,8 @@ Route::prefix('v1')->middleware('web.login')->group(function() {
 
     // 用户信息
     Route::get('/user/info', [\App\Http\Controllers\Api\v1\MemberController::class, 'info']);
-    Route::post('/user/authInfo', [\App\Http\Controllers\Api\v1\MemberController::class, 'authInfo']);
     Route::post('/user/modify', [\App\Http\Controllers\Api\v1\MemberController::class, 'modify']);
-    Route::post('/user/auth', [\App\Http\Controllers\Api\v1\MemberController::class, 'auth']);
     Route::post('/user/teamList', [\App\Http\Controllers\Api\v1\MemberController::class, 'teamList']);
-    Route::post('/user/bill', [\App\Http\Controllers\Api\v1\MemberController::class, 'bill']);
-    Route::post('/user/setting', [\App\Http\Controllers\Api\v1\MemberController::class, 'setting']);
     Route::post('/user/logOff', [\App\Http\Controllers\Api\v1\MemberController::class, 'logOff']);
 
     // 银行卡