Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/finance/FinanceRepository.php

@@ -234,46 +234,51 @@ class FinanceRepository extends BaseRepository
      */
     public function member_overview($mer_id = 0)
     {
-        $where = "1=1 ";
-        if ($mer_id) {
-            $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
-            $userRepository = app()->make(UserRepository::class);
-            $chilid_userids = $userRepository->getSpreadUidBreak($mer_uid);
-            $chilid_userids_string = "1";
-            if (!empty($chilid_userids)) {
-                $chilid_userids_string = implode(',',$chilid_userids);
-            }
-            $where .= "and uid in ({$chilid_userids_string})";
-        }
-        $type = input('type', 1);
-        $day = input('day', '');
+        $where = " 1=1";
+        $sWeekWhere = " 1=1";
+        $weekWhere = " 1=1";
+        $dayWhere = " 1=1";
 
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
-        }
-        $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
-        $dataQuery = array_column($dataQuery, 'count', 'user_group');
-        $shopPartnerCount = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where mer_id={$mer_id} and is_shop_partner=1 group by user_group");
+        $currentDate = date('Y-m-d');
+        // 上周的开始日期（周一）
+        $startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
+        // 上周的结束日期（周日）
+        $endDate = date('Y-m-d', strtotime('last Sunday', strtotime($currentDate)));
+
+        // 获取今天的日期和时间
+        $today = new \DateTime();
+        // 计算一周前的日期
+        $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
+        $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
+        
+        // 格式化日期
+        $todayFormatted = $today->format('Y-m-d');
+        $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
+        //上周时间条件
+        $sWeekWhere .= " and DATE(create_time) >= '" . $startDate . "' and DATE(create_time) <= '" . $endDate . "'";
+        //周时间条件
+        $weekWhere .= " and DATE(create_time) >= '" . $oneWeekAgoFormatted . "' and DATE(create_time) <= '" . $todayFormatted . "'";
+        //今日时间条件
+        $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
 
-        $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
-        $maker = array_column($maker, 'count', 'k');
 
-        $userByCodeCount = Db::query("SELECT 'temp' as `temp1`, count(*) count FROM `rrx_user` where {$where} and user_group =4 and is_show = 3");
-        $userByCodeCount = array_column($userByCodeCount, 'count', 'temp1');
+        $userCount = Db::name('user')->where($where)->count();
+        $userDayCount = Db::name('user')->where($dayWhere)->count();
+        $userDjCount = Db::name('user')->where($where)->where('status', 0)->count();
 
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员总人数'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增会员'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '被冻结会员数'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区总业绩'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区上周总业绩'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区本周总业绩'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员专区今日总业绩'];
+        // 会员专区业绩
+        $chengjiaomoney = Db::name('store_order')->where($where)->where('paid', 1)->where('mer_id', 496)->sum('pay_price');
+        $sWeekCount = Db::name('store_order')->where($sWeekWhere)->where('paid', 1)->where('mer_id', 496)->sum('pay_price');
+        $weekCount = Db::name('store_order')->where($weekWhere)->where('paid', 1)->where('mer_id', 496)->sum('pay_price');
+        $todayCount = Db::name('store_order')->where($dayWhere)->where('paid', 1)->where('mer_id', 496)->sum('pay_price');
+
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $userCount, 'name' => '会员总人数'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $userDayCount, 'name' => '今日新增会员'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $userDjCount, 'name' => '被冻结会员数'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $chengjiaomoney, 'name' => '会员专区总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $sWeekCount, 'name' => '会员专区上周总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $weekCount, 'name' => '会员专区本周总业绩'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $todayCount, 'name' => '会员专区今日总业绩'];
 
         $res['left'][] = $data;
         return $res;
@@ -291,41 +296,42 @@ class FinanceRepository extends BaseRepository
     public function pv_overview($mer_id = 0)
     {
         $where = "1=1 ";
-        if ($mer_id) {
-            $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
-            $userRepository = app()->make(UserRepository::class);
-            $chilid_userids = $userRepository->getSpreadUidBreak($mer_uid);
-            $chilid_userids_string = "1";
-            if (!empty($chilid_userids)) {
-                $chilid_userids_string = implode(',',$chilid_userids);
-            }
-            $where .= "and uid in ({$chilid_userids_string})";
-        }
-        $type = input('type', 1);
-        $day = input('day', '');
+        $sWeekWhere = " 1=1";
+        $weekWhere = " 1=1";
+        $dayWhere = " 1=1";
+       
+        $currentDate = date('Y-m-d');
+        // 上周的开始日期（周一）
+        $startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
+        // 上周的结束日期（周日）
+        $endDate = date('Y-m-d', strtotime('last Sunday', strtotime($currentDate)));
 
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
-        }
-        $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
-        $dataQuery = array_column($dataQuery, 'count', 'user_group');
+        // 获取今天的日期和时间
+        $today = new \DateTime();
+        // 计算一周前的日期
+        $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
+        $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
+        
+        // 格式化日期
+        $todayFormatted = $today->format('Y-m-d');
+        $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
+        //上周时间条件
+        $sWeekWhere .= " and DATE(addtime) >= '" . $startDate . "' and DATE(addtime) <= '" . $endDate . "'";
+        //周时间条件
+        $weekWhere .= " and DATE(addtime) >= '" . $oneWeekAgoFormatted . "' and DATE(addtime) <= '" . $todayFormatted . "'";
+        //今日时间条件
+        $dayWhere .= " and DATE(addtime) = '" . $todayFormatted . "'";
 
-        $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
-        $maker = array_column($maker, 'count', 'k');
 
-        $userByCodeCount = Db::query("SELECT 'temp' as `temp1`, count(*) count FROM `rrx_user` where {$where} and user_group =4 and is_show = 3");
-        $userByCodeCount = array_column($userByCodeCount, 'count', 'temp1');
+        $pvCount = Db::name('user_pv_log')->where($where)->sum('pv');
+        // $pvCunCount = Db::name('user_pv_log')->where($where)->where('mer_id', 496)->sum('pv');
+        $weekCount = Db::name('user_pv_log')->where($weekWhere)->sum('pv');
+        $todayCount = Db::name('user_pv_log')->where($dayWhere)->sum('pv');
 
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '平台总PV'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员存量总PV'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周新增PV总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增PV总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $pvCount, 'name' => '平台总PV'];
+        // $data[] = ['className' => 'el-icon-s-goods', 'count' => $pvCunCount, 'name' => '会员存量总PV'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $weekCount, 'name' => '本周新增PV总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $todayCount, 'name' => '今日新增PV总量'];
     
         $res['left'][] = $data;
         return $res;
@@ -343,44 +349,47 @@ class FinanceRepository extends BaseRepository
     public function vr_overview($mer_id = 0)
     {
         $where = "1=1 ";
-        if ($mer_id) {
-            $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
-            $userRepository = app()->make(UserRepository::class);
-            $chilid_userids = $userRepository->getSpreadUidBreak($mer_uid);
-            $chilid_userids_string = "1";
-            if (!empty($chilid_userids)) {
-                $chilid_userids_string = implode(',',$chilid_userids);
-            }
-            $where .= "and uid in ({$chilid_userids_string})";
-        }
-        $type = input('type', 1);
-        $day = input('day', '');
+        $sWeekWhere = " 1=1";
+        $weekWhere = " 1=1";
+        $dayWhere = " 1=1";
+       
+        $currentDate = date('Y-m-d');
+        // 上周的开始日期（周一）
+        $startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
+        // 上周的结束日期（周日）
+        $endDate = date('Y-m-d', strtotime('last Sunday', strtotime($currentDate)));
 
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
-        }
-        $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
-        $dataQuery = array_column($dataQuery, 'count', 'user_group');
-
-        $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
-        $maker = array_column($maker, 'count', 'k');
-
-        $userByCodeCount = Db::query("SELECT 'temp' as `temp1`, count(*) count FROM `rrx_user` where {$where} and user_group =4 and is_show = 3");
-        $userByCodeCount = array_column($userByCodeCount, 'count', 'temp1');
-
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '平台总VR'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员存量总VR'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周新增VR总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增VR总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员消耗总VR'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周消耗VR总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日消耗VR总量'];
+        // 获取今天的日期和时间
+        $today = new \DateTime();
+        // 计算一周前的日期
+        $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
+        $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
+        
+        // 格式化日期
+        $todayFormatted = $today->format('Y-m-d');
+        $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
+        //上周时间条件
+        $sWeekWhere .= " and DATE(addtime) >= '" . $startDate . "' and DATE(addtime) <= '" . $endDate . "'";
+        //周时间条件
+        $weekWhere .= " and DATE(addtime) >= '" . $oneWeekAgoFormatted . "' and DATE(addtime) <= '" . $todayFormatted . "'";
+        //今日时间条件
+        $dayWhere .= " and DATE(addtime) = '" . $todayFormatted . "'";
+
+        $vrCount = Db::name('user_sign_vr')->where($where)->sum('number');
+        $vrUserCount = Db::name('user')->where($where)->sum('vr');
+        $vrWeekCount = Db::name('user_sign_vr')->where($weekWhere)->where('type', 1)->sum('number');
+        $vrDayCount = Db::name('user_sign_vr')->where($dayWhere)->where('type', 1)->sum('number');
+        $vrXhCount = Db::name('user_sign_vr')->where($where)->where('type', 2)->sum('number');
+        $vrWeekXhCount = Db::name('user_sign_vr')->where($weekWhere)->where('type', 2)->sum('number');
+        $vrDayXhCount = Db::name('user_sign_vr')->where($dayWhere)->where('type', 2)->sum('number');
+
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrCount, 'name' => '平台总VR'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrUserCount, 'name' => '会员存量总VR'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrWeekCount, 'name' => '本周新增VR总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrDayCount, 'name' => '今日新增VR总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrXhCount, 'name' => '会员消耗总VR'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrWeekXhCount, 'name' => '本周消耗VR总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $vrDayXhCount, 'name' => '今日消耗VR总量'];
    
         $res['left'][] = $data;
         return $res;
@@ -397,48 +406,49 @@ class FinanceRepository extends BaseRepository
     public function jifen_overview($mer_id = 0)
     {
         $where = "1=1 ";
-        if ($mer_id) {
-            $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
-            $userRepository = app()->make(UserRepository::class);
-            $chilid_userids = $userRepository->getSpreadUidBreak($mer_uid);
-            $chilid_userids_string = "1";
-            if (!empty($chilid_userids)) {
-                $chilid_userids_string = implode(',',$chilid_userids);
-            }
-            $where .= "and uid in ({$chilid_userids_string})";
-        }
-        $type = input('type', 1);
-        $day = input('day', '');
-
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
-        }
-        $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
-        $dataQuery = array_column($dataQuery, 'count', 'user_group');
-
-        $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
-        $maker = array_column($maker, 'count', 'k');
-
-        $userByCodeCount = Db::query("SELECT 'temp' as `temp1`, count(*) count FROM `rrx_user` where {$where} and user_group =4 and is_show = 3");
-        $userByCodeCount = array_column($userByCodeCount, 'count', 'temp1');
-
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '平台总积分'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员存量总积分'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周新增积分总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日新增积分总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '会员消耗总积分'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '本周消耗积分总量'];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => 0, 'name' => '今日消耗积分总量'];
+        $sWeekWhere = " 1=1";
+        $weekWhere = " 1=1";
+        $dayWhere = " 1=1";
+       
+        $currentDate = date('Y-m-d');
+        // 上周的开始日期（周一）
+        $startDate = date('Y-m-d', strtotime('last Monday', strtotime($currentDate)));
+        // 上周的结束日期（周日）
+        $endDate = date('Y-m-d', strtotime('last Sunday', strtotime($currentDate)));
 
+        // 获取今天的日期和时间
+        $today = new \DateTime();
+        // 计算一周前的日期
+        $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
+        $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
+        
+        // 格式化日期
+        $todayFormatted = $today->format('Y-m-d');
+        $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
+        //上周时间条件
+        $sWeekWhere .= " and DATE(addtime) >= '" . $startDate . "' and DATE(addtime) <= '" . $endDate . "'";
+        //周时间条件
+        $weekWhere .= " and DATE(addtime) >= '" . $oneWeekAgoFormatted . "' and DATE(addtime) <= '" . $todayFormatted . "'";
+        //今日时间条件
+        $dayWhere .= " and DATE(addtime) = '" . $todayFormatted . "'";
+
+        $jfCount = Db::name('user_sign_score')->where($where)->sum('reward_socre');
+        $jfUserCount = Db::name('user')->where($where)->sum('score');
+        $jfWeekCount = Db::name('user_sign_score')->where($weekWhere)->where('pm', 1)->sum('reward_socre');
+        $jfDayCount = Db::name('user_sign_score')->where($dayWhere)->where('pm', 1)->sum('reward_socre');
+        $jfXhCount = Db::name('user_sign_score')->where($where)->where('pm', 2)->sum('reward_socre');
+        $jfWeekXhCount = Db::name('user_sign_score')->where($weekWhere)->where('pm', 2)->sum('reward_socre');
+        $jfDayXhCount = Db::name('user_sign_score')->where($dayWhere)->where('pm', 2)->sum('reward_socre');
+
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfCount, 'name' => '平台总积分'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfUserCount, 'name' => '会员存量总积分'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfWeekCount, 'name' => '本周新增积分总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfDayCount, 'name' => '今日新增积分总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfXhCount, 'name' => '会员消耗总积分'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfWeekXhCount, 'name' => '本周消耗积分总量'];
+        $data[] = ['className' => 'el-icon-s-goods', 'count' => $jfDayXhCount, 'name' => '今日消耗积分总量'];
 
         $res['left'][] = $data;
-
         return $res;
     }