Merge remote-tracking branch 'origin/dev' into dev

app/controller/api/Auth.php

@@ -893,10 +893,48 @@ class Auth extends BaseController
 
         // 是否共富体系会员
         $isSharedProsperity = false;
-        $SharedProsperityUser = Db::name('shared_prosperity_user')->where('user_id', $user['uid'])->value('id');
-        if ($SharedProsperityUser) $isSharedProsperity = true;
+        $SharedProsperityLevel = 0;
+        $SharedProsperityUserPv = 0;
+        $SharedProsperityTeamPv = 0;
+        $SharedProsperityGroupId = 0;
+        $SharedProsperityUser = Db::name('shared_prosperity_user')->where('user_id', $user['uid'])->field('id,partner_level,pv')->find();
+        if ($SharedProsperityUser) {
+            $isSharedProsperity = true;
+            $SharedProsperityLevel = $SharedProsperityUser['partner_level'];
+            $SharedProsperityUserPv = $SharedProsperityUser['pv'];
+
+            // 直推人数
+            /**@var $SharedProsperityUserRepository SharedProsperityUserRepository*/
+            $SharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+            $SharedProsperityTeamPv = count($SharedProsperityUserRepository->getSharedProsperityUserEntityListByParentId($user['uid']));
+
+            // 团员身份
+            $groupId = Db::name('shared_prosperity_group_user')->where('user_id', $user['uid'])->value('group_id');
+            if ($groupId) $SharedProsperityGroupId = $groupId;
+        }
         $data['isSharedProsperity'] = $isSharedProsperity;
-
+        $data['SharedProsperityLevel'] = $SharedProsperityLevel;
+        $data['SharedProsperityUserPv'] = $SharedProsperityUserPv;
+        $data['SharedProsperityTeamPv'] = $SharedProsperityTeamPv;
+        $data['SharedProsperityGroupId'] = $SharedProsperityGroupId;
+
+        // 查询会员体系团队pv
+        $memberTeamPvLog = false;
+        $sql = "select getUserLevelId({$user['uid']}) as uids";
+        try {
+            $spread_user_list = Db::query($sql);
+        } catch (\Exception $exception) {
+            return app('json')->fail($exception->getMessage());
+        }
+
+        $spread_user_list = explode(",", trim($spread_user_list[0]['uids'], '$,'));
+        $pvLog = Db::name('user_pv_log')
+            ->whereIn('uid',$spread_user_list)
+            ->limit(1)
+            ->select()
+            ->toArray();
+        if ($pvLog) $memberTeamPvLog = true;
+        $data['memberTeamPvLog'] = $memberTeamPvLog;
 
         return app('json')->success($data );
     }