Merge branch 'dev-sc-260204'

app/common/dao/shared/SharedProsperityUserDao.php

@@ -161,9 +161,9 @@ class SharedProsperityUserDao extends BaseDao
      * @param int $userId
      * @return float
      */
-    public function getTeamPvSum(int $userId): float
+    public function getTeamPvSum(int $userId, int $hierarchy = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Hierarchy']['code']): float
     {
-        $userIds = $this->getAllSubordinateUserIds($userId, false);
+        $userIds = $this->getAllSubordinateUserIds($userId, false, $hierarchy);
         if (empty($userIds)) {
             return 0.0;
         }
@@ -184,9 +184,9 @@ class SharedProsperityUserDao extends BaseDao
      * @param int $userId
      * @return float
      */
-    public function getTeamPvSumWithSelf(int $userId): float
+    public function getTeamPvSumWithSelf(int $userId, $self = false): float
     {
-        $userIds = $this->getAllSubordinateUserIds($userId, true);
+        $userIds = $this->getAllSubordinateUserIds($userId, $self);
         if (empty($userIds)) {
             return 0.0;
         }

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -189,7 +189,7 @@ class SharedProsperityUserRepository extends BaseRepository
         $list = $this->dao->getDirectByUserId($userId);
         if (empty($list)) {
             // 没有直推用户，仍然返回统计数据（我的部门总人数和总业绩）
-            $myTeamUserIds = $this->dao->getAllSubordinateUserIds($userId, true);
+            $myTeamUserIds = $this->dao->getAllSubordinateUserIds($userId);
             $myTeamTotalCount = count($myTeamUserIds);
             $myTeamPvSum = $this->dao->getTeamPvSumWithSelf($userId);
             return [
@@ -222,9 +222,9 @@ class SharedProsperityUserRepository extends BaseRepository
         $maxPv = 0;
         $maxPvIndex = -1;
         foreach ($list as $index => &$item) {
-            $teamUserIds = $this->dao->getAllSubordinateUserIds($item['user_id'], true);
+            $teamUserIds = $this->dao->getAllSubordinateUserIds($item['user_id'],false,4);
             $teamTotalCount = count($teamUserIds);
-            $teamPvSum = $this->dao->getTeamPvSumWithSelf($item['user_id']);
+            $teamPvSum = $this->dao->getTeamPvSum($item['user_id'],4);
             $item['team_total_count'] = $teamTotalCount;
             $item['team_pv_sum'] = $teamPvSum;
             // 补充用户信息
@@ -259,9 +259,9 @@ class SharedProsperityUserRepository extends BaseRepository
             $smallDepartment = $list;
         }
         // 计算统计数据
-        $myTeamUserIds = $this->dao->getAllSubordinateUserIds($userId, true);
+        $myTeamUserIds = $this->dao->getAllSubordinateUserIds($userId);
         $myTeamTotalCount = count($myTeamUserIds);
-        $myTeamPvSum = $this->dao->getTeamPvSumWithSelf($userId);
+        $myTeamPvSum = $this->dao->getTeamPvSum($userId);
         $smallDepartmentPvSum = 0;
         foreach ($smallDepartment as $item) {
             $smallDepartmentPvSum += $item['team_pv_sum'];