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

# Conflicts:
#	app/common/dao/shared/SharedProsperityRewardRecordDao.php

app/common/dao/shared/SharedProsperityRewardRecordDao.php

@@ -88,4 +88,92 @@ class SharedProsperityRewardRecordDao extends BaseDao
         }
         return $entityList;
     }
+
+    /**
+     * 获取奖励记录分页列表
+     * @param int|null $userId 用户ID
+     * @param int|null $type 奖励类型
+     * @param int|null $status 状态：0=待确定 1=有效 -1=无效
+     * @param int|null $typeShop 类型店铺：0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上 9话费
+     * @param int|null $pm 0=支出 1=获得
+     * @param int $page 页码
+     * @param int $pageSize 每页数量
+     * @return array
+     */
+    public function getRewardList(?int $userId = null, ?int $type = null, ?int $status = null, ?int $typeShop = null, ?int $pm = null, int $page = 1, int $pageSize = 10): array
+    {
+        $list = [];
+        try {
+            /** @var SharedProsperityRewardRecord $model */
+            $model = $this->getModel();
+            $query = $model::getDB();
+            // 构建 where 条件
+            if (!is_null($userId) && $userId > 0) {
+                $query->where('user_id', $userId);
+            }
+            if (!is_null($type)) {
+                $query->where('type', $type);
+            }
+            if (!is_null($status)) {
+                $query->where('status', $status);
+            }
+            if (!is_null($typeShop)) {
+                $query->where('type_shop', $typeShop);
+            }
+            if (!is_null($pm)) {
+                $query->where('pm', $pm);
+            }
+            // 按创建时间倒序排列
+            $query->order('create_time', 'desc');
+            $list = $query->paginate(['page' => $page, 'list_rows' => $pageSize])
+                ->toArray();
+        } catch (\Exception $e) {
+            // 记录日志或忽略
+        }
+        return $list;
+    }
+
+    /**
+     * 根据条件求和奖励记录中的 number 字段
+     * @param int|array|null $userIds 单个用户ID或用户ID数组，为null时忽略此条件
+     * @param int|null $type
+     * @param int|null $status
+     * @param int|null $typeShop
+     * @param int|null $pm
+     * @return float
+     */
+    public function getRewardSum($userIds = null, ?int $type = null, ?int $status = null, ?int $typeShop = null, ?int $pm = null): float
+    {
+        try {
+            /** @var SharedProsperityRewardRecord $model */
+            $model = $this->getModel();
+            $query = $model::getDB();
+            if (!is_null($userIds)) {
+                if (is_array($userIds)) {
+                    if (empty($userIds)) {
+                        return 0.0;
+                    }
+                    $query->whereIn('user_id', $userIds);
+                } else {
+                    $query->where('user_id', (int) $userIds);
+                }
+            }
+            if (!is_null($type)) {
+                $query->where('type', $type);
+            }
+            if (!is_null($status)) {
+                $query->where('status', $status);
+            }
+            if (!is_null($typeShop)) {
+                $query->where('type_shop', $typeShop);
+            }
+            if (!is_null($pm)) {
+                $query->where('pm', $pm);
+            }
+            $sum = $query->sum('number');
+            return (float) $sum;
+        } catch (\Exception $e) {
+            return 0.0;
+        }
+    }
 }

app/common/repositories/shared/SharedProsperityRewardRecordRepository.php

@@ -3,6 +3,7 @@
 namespace app\common\repositories\shared;
 
 use app\common\dao\shared\SharedProsperityRewardRecordDao;
+use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
@@ -277,4 +278,79 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
 
         return $idList;
     }
+
+
+    /**
+     * 获取奖励记录分页列表，并返回统计数据
+     * @param int $userId 用户ID
+     * @param int $status 前端传入的状态：1=有效，0=待确定
+     * @param int $page 页码
+     * @param int $pageSize 每页数量，默认10
+     * @return array
+     */
+    public function getRewardList($userId, $status, $page, $pageSize = 10)
+    {
+        $type = SharedProsperityRewardRecordEnum::TYPE['PV']['code'];
+        if ($status == 1) {
+            $statusCode = SharedProsperityRewardRecordEnum::STATUS['VALID']['code'];
+        } else {
+            $statusCode = SharedProsperityRewardRecordEnum::STATUS['PENDING']['code'];
+        }
+        $pm = 1; // 只查询获得（收入）
+        // 获取分页列表
+        $list = $this->dao->getRewardList($userId, $type, $statusCode, null, $pm, $page, $pageSize);
+
+        // 计算统计数据
+        $stats = $this->calculateRewardStats($userId);
+
+        return [
+            'list' => $list,
+            'stats' => $stats,
+        ];
+    }
+
+    /**
+     * 计算奖励统计数据
+     * @param int $userId
+     * @return array
+     */
+    private function calculateRewardStats(int $userId): array
+    {
+        $type = SharedProsperityRewardRecordEnum::TYPE['PV']['code'];
+        $pm = 1; // 获得
+
+        // 1. 我的贡献值（有效）
+        $myContribution = $this->dao->getRewardSum($userId, $type, SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], null, $pm);
+        // 2. 未生效贡献值（待确定）
+        $pendingContribution = $this->dao->getRewardSum($userId, $type, SharedProsperityRewardRecordEnum::STATUS['PENDING']['code'], null, $pm);
+
+        // 获取直推用户ID列表
+        /** @var SharedProsperityUserDao $sharedProsperityUserDao */
+        $sharedProsperityUserDao = app()->make(SharedProsperityUserDao::class);
+        $directUserIds = array_column($sharedProsperityUserDao->getDirectByUserId($userId), 'user_id');
+
+        // 3. 直推贡献值（直推用户的有效贡献总和）
+        $directContribution = 0;
+        if (!empty($directUserIds)) {
+            $directContribution = $this->dao->getRewardSum($directUserIds, $type, SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], null, $pm);
+        }
+
+        // 4. 小部门贡献值（需要区分大部门和小部门）
+        // 获取团队划分
+        /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
+        $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+        $teamData = $sharedProsperityUserRepository->getTeam($userId);
+        $smallDepartmentUserIds = array_column($teamData['small_department'] ?? [], 'user_id');
+        $smallDepartmentContribution = 0;
+        if (!empty($smallDepartmentUserIds)) {
+            $smallDepartmentContribution = $this->dao->getRewardSum($smallDepartmentUserIds, $type, SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], null, $pm);
+        }
+
+        return [
+            'my_contribution' => (float) $myContribution,
+            'pending_contribution' => (float) $pendingContribution,
+            'direct_contribution' => (float) $directContribution,
+            'small_department_contribution' => (float) $smallDepartmentContribution,
+        ];
+    }
 }

app/controller/api/shareProsperity/Record.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace app\controller\api\shareProsperity;
+
+use crmeb\basic\BaseController;
+use app\common\repositories\shared\SharedProsperityRewardRecordRepository;
+
+class Record extends BaseController
+{
+    /**
+     * @return mixed
+     * @author 史晨
+     * @date 2026/2/9 15:52
+     * 贡献值列表
+     */
+    public function list()
+    {
+        $userId = $this->request->uid();
+        $data = request()->only(['status', 'page']);
+        /** @var SharedProsperityRewardRecordRepository $repository */
+        $repository = app()->make(SharedProsperityRewardRecordRepository::class);
+        $list = $repository->getRewardList($userId, $data['status'], $data['page']);
+        return app('json')->success($list);
+    }
+}

route/api.php

@@ -359,6 +359,8 @@ Route::group('api/', function () {
         Route::group('shareProsperity', function () {
             // 部门
             Route::get('get_share_prosperity_team_list', 'Team/list');
+            // 贡献值
+            Route::get('get_reward_list', 'Record/list');
         })->prefix('api.shareProsperity.');
 
         //购物车