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

app/common/repositories/finance/FinanceRepository.php

@@ -398,6 +398,13 @@ class FinanceRepository extends BaseRepository
             $data['three'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedUserDataQuery[5] ?? 0), 'name' => '总裁合伙人', 'partner_level' => 5];
             $data['three'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedUserDataQuery[6] ?? 0), 'name' => '联席主席团', 'partner_level' => 6];
 
+            // 共富百人团、千人团、万人团数据
+            $sharedGroupUserDataQuery = Db::query("SELECT group_id,count(user_id) count FROM `rrx_shared_prosperity_group_user` group by group_id");
+            $sharedGroupUserDataQuery = array_column($sharedGroupUserDataQuery, 'count', 'group_id');
+            $data['four'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedGroupUserDataQuery[1] ?? 0), 'name' => '万人团', 'group_id' => 1];
+            $data['four'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedGroupUserDataQuery[2] ?? 0), 'name' => '千人团', 'group_id' => 2];
+            $data['four'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($sharedGroupUserDataQuery[3] ?? 0), 'name' => '百人团', 'group_id' => 3];
+
             $res['left'] = $data;
         }
         return $res;