Merge branch 'dev-sc-260204' into dev

app/controller/api/Auth.php

@@ -896,6 +896,7 @@ class Auth extends BaseController
         $SharedProsperityLevel = 0;
         $SharedProsperityUserPv = 0;
         $SharedProsperityTeamPv = 0;
+        $SharedProsperityGroupId = 0;
         $SharedProsperityUser = Db::name('shared_prosperity_user')->where('user_id', $user['uid'])->value('id,partner_level,pv');
         if ($SharedProsperityUser) {
             $isSharedProsperity = true;
@@ -907,11 +908,16 @@ class Auth extends BaseController
             $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;
 
 
         return app('json')->success($data );