Quellcode durchsuchen

fix(finance): 修复共富会员业绩统计查询条件

- 添加了状态和收支类型过滤条件,确保只统计有效收入记录
- 修改了数据库查询的链式调用格式以提高可读性
- 更新了业绩统计相关数据项的名称显示
- 确保所有业绩统计查询都应用相同的过滤条件
shichen vor 4 Monaten
Ursprung
Commit
8cc58b7acb
1 geänderte Dateien mit 19 neuen und 8 gelöschten Zeilen
  1. 19 8
      app/common/repositories/finance/FinanceRepository.php

+ 19 - 8
app/common/repositories/finance/FinanceRepository.php

@@ -491,17 +491,28 @@ class FinanceRepository extends BaseRepository
491 491
         $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
492 492
         $sharedUserCount = Db::name('shared_prosperity_user')->count(); //共富会员总人数
493 493
         $sharedUserDayCount = Db::name('shared_prosperity_user')->where($dayWhere)->count(); //共富今日新增会员
494
-        $sharedUserPvCount = Db::name('shared_prosperity_reward_record')->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区总业绩
495
-        $sharedUserLastWeekPv = Db::name('shared_prosperity_reward_record')->where($sWeekWhere)->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区上周总业绩
496
-        $sharedUserWeekPv = Db::name('shared_prosperity_reward_record')->where($weekWhere)->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区本周总业绩
497
-        $sharedUserTodayPv = Db::name('shared_prosperity_reward_record')->where($dayWhere)->where(['type'=>SharedProsperityRewardRecordEnum::TYPE['PV']['code']])->sum('number'); // 共富会员专区今日总业绩
494
+        $sharedUserPvCount = Db::name('shared_prosperity_reward_record')
495
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
496
+            ->sum('number'); // 共富会员专区总业绩
497
+        $sharedUserLastWeekPv = Db::name('shared_prosperity_reward_record')
498
+            ->where($sWeekWhere)
499
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
500
+            ->sum('number'); // 共富会员专区上周总业绩
501
+        $sharedUserWeekPv = Db::name('shared_prosperity_reward_record')
502
+            ->where($weekWhere)
503
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
504
+            ->sum('number'); // 共富会员专区本周总业绩
505
+        $sharedUserTodayPv = Db::name('shared_prosperity_reward_record')
506
+            ->where($dayWhere)
507
+            ->where(['type' => SharedProsperityRewardRecordEnum::TYPE['PV']['code'], 'status' => SharedProsperityRewardRecordEnum::STATUS['VALID']['code'], 'pm' => SharedProsperityRewardRecordEnum::PM['INCOME']['code']])
508
+            ->sum('number'); // 共富会员专区今日总业绩
498 509
 
499 510
         $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserCount, 'name' => '共富会员总人数'];
500 511
         $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserDayCount, 'name' => '共富今日新增会员'];
501
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserPvCount, 'name' => '共富会员专区总业绩'];
502
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserLastWeekPv, 'name' => '共富会员专区上周总业绩'];
503
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserWeekPv, 'name' => '共富会员专区本周总业绩'];
504
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserTodayPv, 'name' => '共富会员专区今日总业绩'];
512
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserPvCount, 'name' => '共富专区总业绩'];
513
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserLastWeekPv, 'name' => '共富专区上周总业绩'];
514
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserWeekPv, 'name' => '共富专区本周总业绩'];
515
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sharedUserTodayPv, 'name' => '共富专区今日总业绩'];
505 516
 
506 517
         $res['left'][] = $data;
507 518
         return $res;