From 89345c560f91578ff9b7b8ac4a8609ecdad0f710 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 3 Apr 2023 09:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/services/order/StoreOrderServices.php | 54 +++++--------------
 1 file changed, 12 insertions(+), 42 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index bdd04d39e..3b01ce3f9 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -1420,10 +1420,17 @@ HTML;
         return bcmul(bcdiv((bcsub($nowValue, $lastValue, 2)), $lastValue, 4), 100, 2);
     }
 
+    /**
+     * 后台首页顶部统计
+     * @return array
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/04/03
+     */
     public function homeStatics()
     {
-        /** @var UserServices $uSercice */
-        $uSercice = app()->make(UserServices::class);
+        /** @var UserServices $userService */
+        $userService = app()->make(UserServices::class);
         /** @var StoreProductLogServices $productLogServices */
         $productLogServices = app()->make(StoreProductLogServices::class);
         //TODO 销售额
@@ -1433,22 +1440,12 @@ HTML;
         $yesterday_sales = $this->dao->todaySales('yesterday');
         //日同比
         $sales_today_ratio = $this->growth($today_sales, $yesterday_sales);
-//        //周销售额
-//        //本周
-//        $this_week_sales = $this->dao->thisWeekSales('week');
-//        //上周
-//        $last_week_sales = $this->dao->thisWeekSales('last week');
-//        //周同比
-//        $sales_week_ratio = $this->growth($this_week_sales, $last_week_sales);
         //总销售额
         $total_sales = $this->dao->totalSales('month');
         $sales = [
             'today' => $today_sales,
             'yesterday' => $yesterday_sales,
             'today_ratio' => $sales_today_ratio,
-//            'week' => $this_week_sales,
-//            'last_week' => $last_week_sales,
-//            'week_ratio' => $sales_week_ratio,
             'total' => $total_sales . '元',
             'date' => '今日'
         ];
@@ -1459,21 +1456,12 @@ HTML;
         $yesterday_visits = $productLogServices->count(['time' => 'yesterday', 'type' => 'visit']);
         //日同比
         $visits_today_ratio = $this->growth($today_visits, $yesterday_visits);
-//        //本周访问量
-//        $this_week_visits = $productLogServices->count(['time' => 'week', 'type' => 'visit']);
-//        //上周访问量
-//        $last_week_visits = $productLogServices->count(['time' => 'last week', 'type' => 'visit']);
-//        //周同比
-//        $visits_week_ratio = $this->growth($this_week_visits, $last_week_visits);
         //总访问量
         $total_visits = $productLogServices->count(['time' => 'month', 'type' => 'visit']);
         $visits = [
             'today' => $today_visits,
             'yesterday' => $yesterday_visits,
             'today_ratio' => $visits_today_ratio,
-//            'week' => $this_week_visits,
-//            'last_week' => $last_week_visits,
-//            'week_ratio' => $visits_week_ratio,
             'total' => $total_visits . 'Pv',
             'date' => '今日'
         ];
@@ -1484,46 +1472,28 @@ HTML;
         $yesterday_order = $this->dao->todayOrderVisit('yesterday', 1);
         //订单日同比
         $order_today_ratio = $this->growth($today_order, $yesterday_order);
-//        //本周订单量
-//        $this_week_order = $this->dao->todayOrderVisit('week', 2);
-//        //上周订单量
-//        $last_week_order = $this->dao->todayOrderVisit('last week', 2);
-//        //订单周同比
-//        $order_week_ratio = $this->growth($this_week_order, $last_week_order);
         //总订单量
         $total_order = $this->dao->count(['time' => 'month', 'paid' => 1, 'refund_status' => 0, 'pid' => 0]);
         $order = [
             'today' => $today_order,
             'yesterday' => $yesterday_order,
             'today_ratio' => $order_today_ratio,
-//            'week' => $this_week_order,
-//            'last_week' => $last_week_order,
-//            'week_ratio' => $order_week_ratio,
             'total' => $total_order . '单',
             'date' => '今日'
         ];
         //TODO 用户
         //今日新增用户
-        $today_user = $uSercice->todayAddVisits('today', 1);
+        $today_user = $userService->todayAddVisits('today', 1);
         //昨日新增用户
-        $yesterday_user = $uSercice->todayAddVisits('yesterday', 1);
+        $yesterday_user = $userService->todayAddVisits('yesterday', 1);
         //新增用户日同比
         $user_today_ratio = $this->growth($today_user, $yesterday_user);
-//        //本周新增用户
-//        $this_week_user = $uSercice->todayAddVisits('week', 2);
-//        //上周新增用户
-//        $last_week_user = $uSercice->todayAddVisits('last week', 2);
-//        //新增用户周同比
-//        $user_week_ratio = $this->growth($this_week_user, $last_week_user);
         //所有用户
-        $total_user = $uSercice->count(['time' => 'month']);
+        $total_user = $userService->count(['time' => 'month']);
         $user = [
             'today' => $today_user,
             'yesterday' => $yesterday_user,
             'today_ratio' => $user_today_ratio,
-//            'week' => $this_week_user,
-//            'last_week' => $last_week_user,
-//            'week_ratio' => $user_week_ratio,
             'total' => $total_user . '人',
             'date' => '今日'
         ];