Sfoglia il codice sorgente

feat(shared-prosperity): 添加团队PV统计包含自身选项

- 在getTeamPvSum方法中新增includeSelf参数,默认值为false
- 修改DAO层实现以支持是否包含自身的团队成员统计
- 更新仓库层调用逻辑,将includeSelf设置为true以包含当前用户
- 修正团队总业绩计算逻辑,使其能够选择性包含用户自身数据
shichen 4 mesi fa
parent
commit
61f2a25186

+ 2 - 2
app/common/dao/shared/SharedProsperityUserDao.php

@@ -161,9 +161,9 @@ class SharedProsperityUserDao extends BaseDao
161 161
      * @param int $userId
162 162
      * @return float
163 163
      */
164
-    public function getTeamPvSum(int $userId, int $hierarchy = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Hierarchy']['code']): float
164
+    public function getTeamPvSum(int $userId, int $hierarchy = CommonEnum::ORDER_EARNING_ALLOCATION['SharedProsperity']['Hierarchy']['code'], $includeSelf = false): float
165 165
     {
166
-        $userIds = $this->getAllSubordinateUserIds($userId, false, $hierarchy);
166
+        $userIds = $this->getAllSubordinateUserIds($userId, $includeSelf, $hierarchy);
167 167
         if (empty($userIds)) {
168 168
             return 0.0;
169 169
         }

+ 1 - 1
app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -231,7 +231,7 @@ class SharedProsperityUserRepository extends BaseRepository
231 231
         foreach ($list as $index => &$item) {
232 232
             $teamUserIds = $this->dao->getAllSubordinateUserIds($item['user_id'], false, 4);
233 233
             $teamTotalCount = count($teamUserIds);
234
-            $teamPvSum = $this->dao->getTeamPvSum($item['user_id'], 4);
234
+            $teamPvSum = $this->dao->getTeamPvSum($item['user_id'], 4, true);
235 235
             $item['team_total_count'] = $teamTotalCount;
236 236
             $item['team_pv_sum'] = $teamPvSum;
237 237
             // 补充用户信息