Просмотр исходного кода

feat(shared-prosperity): 添加奖励记录类型筛选功能

- 在 SharedProsperityRewardRecordDao 中的 getListByTime 方法增加 type 参数
- 在 SharedProsperityRewardRecordRepository 中同步更新 getListByTime 方法签名
- 引入 SharedProsperityRewardRecordEnum 枚举类用于定义奖励类型常量
- 定义 REWARD_TYPE_PV 常量对应 PV 类型奖励记录
- 修改任务仓库中获取订单列表时使用 PV 类型进行筛选
- 修改任务仓库中获取奖励列表时使用 PV 类型进行筛选
shichen месяцев назад: 5
Родитель
Сommit
ee3bdef337

+ 2 - 1
app/common/dao/shared/SharedProsperityRewardRecordDao.php

@@ -188,10 +188,11 @@ class SharedProsperityRewardRecordDao extends BaseDao
188
      * @date 2026/2/10 13:56
188
      * @date 2026/2/10 13:56
189
      * 时间范围搜索
189
      * 时间范围搜索
190
      */
190
      */
191
-    public function getListByTime($start, $end)
191
+    public function getListByTime($start, $end, $type)
192
     {
192
     {
193
         $model = $this->getModel();
193
         $model = $this->getModel();
194
         return $model::getDB()
194
         return $model::getDB()
195
+            ->where('type',$type)
195
             ->where('take_time', '>', $start)
196
             ->where('take_time', '>', $start)
196
             ->where('take_time', '<', $end)
197
             ->where('take_time', '<', $end)
197
             ->select()
198
             ->select()

+ 2 - 2
app/common/repositories/shared/SharedProsperityRewardRecordRepository.php

@@ -365,8 +365,8 @@ class SharedProsperityRewardRecordRepository extends BaseRepository
365
      * @date 2026/2/10 14:07
365
      * @date 2026/2/10 14:07
366
      * 获取时间段内奖励列表
366
      * 获取时间段内奖励列表
367
      */
367
      */
368
-    public function getListByTime($startTime, $endTime)
368
+    public function getListByTime($startTime, $endTime, $type)
369
     {
369
     {
370
-        return $this->dao->getListByTime($startTime, $endTime);
370
+        return $this->dao->getListByTime($startTime, $endTime, $type);
371
     }
371
     }
372
 }
372
 }

+ 5 - 3
app/common/repositories/shared/SharedProsperityTaskRepository.php

@@ -7,8 +7,8 @@ use app\common\dao\shared\SharedProsperityPointLogDao;
7
 use app\common\dao\shared\SharedProsperityRecommendConfigDao;
7
 use app\common\dao\shared\SharedProsperityRecommendConfigDao;
8
 use app\common\dao\shared\SharedProsperityUserDao;
8
 use app\common\dao\shared\SharedProsperityUserDao;
9
 use app\common\enum\CommonEnum;
9
 use app\common\enum\CommonEnum;
10
+use app\common\enum\shared\SharedProsperityRewardRecordEnum;
10
 use app\common\repositories\BaseRepository;
11
 use app\common\repositories\BaseRepository;
11
-use think\Collection;
12
 use think\facade\Db;
12
 use think\facade\Db;
13
 use think\facade\Log;
13
 use think\facade\Log;
14
 
14
 
@@ -16,6 +16,8 @@ class SharedProsperityTaskRepository extends BaseRepository
16
 {
16
 {
17
     const PARTNER_RADIO = 1;
17
     const PARTNER_RADIO = 1;
18
 
18
 
19
+    const REWARD_TYPE_PV = SharedProsperityRewardRecordEnum::TYPE['PV']['code'];
20
+
19
     /**
21
     /**
20
      * @param $data
22
      * @param $data
21
      * @return void
23
      * @return void
@@ -34,7 +36,7 @@ class SharedProsperityTaskRepository extends BaseRepository
34
         // 获取pv
36
         // 获取pv
35
         /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
37
         /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
36
         $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
38
         $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
37
-        $orderList = $rewardRecordRepository->getListByTime($start, $end);
39
+        $orderList = $rewardRecordRepository->getListByTime($start, $end, self::REWARD_TYPE_PV);
38
         if (empty($orderList)) {
40
         if (empty($orderList)) {
39
             throw new \Exception('没有订单');
41
             throw new \Exception('没有订单');
40
         }
42
         }
@@ -145,7 +147,7 @@ class SharedProsperityTaskRepository extends BaseRepository
145
         // 获取pv
147
         // 获取pv
146
         /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
148
         /** @var SharedProsperityRewardRecordRepository $rewardRecordRepository */
147
         $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
149
         $rewardRecordRepository = app()->make(SharedProsperityRewardRecordRepository::class);
148
-        $rewardList = $rewardRecordRepository->getListByTime($start, $end);
150
+        $rewardList = $rewardRecordRepository->getListByTime($start, $end, self::REWARD_TYPE_PV);
149
         if (empty($rewardList)) {
151
         if (empty($rewardList)) {
150
             throw new \Exception('没有订单');
152
             throw new \Exception('没有订单');
151
         }
153
         }