Merge branch 'master' into huangfamily

app/controller/admin/Common.php

@@ -160,6 +160,35 @@ class Common extends BaseController
      */
     public function orderNum(StoreOrderRepository $repository)
     {
+        $weekWhere = " 1=1";
+        $dayWhere = " 1=1";
+        // 获取今天的日期和时间
+        $today = new \DateTime();
+        // 格式化日期
+        $todayFormatted = $today->format('Y-m-d');
+        //今日时间条件
+        $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
+
+        //线上订单
+        $todayShangCount = Db::name('store_order')->where($dayWhere)->where('paid', 1)->count();
+
+        //线下订单
+        $todayXiaCount = Db::name('order_merchant')->where($dayWhere)->where('paid', 1)->count();
+
+        //今日新增用户
+        $userDayCount = Db::name('user')->where($dayWhere)->count();
+
+        //今日新增会员
+        $dayWhereNew = str_replace("create_time", "identity_up_time", $dayWhere);
+        $userHyDayCount = Db::name('user')->where($dayWhereNew)->where('user_group', '>', 1)->count();
+
+        //游客数量
+        $todayXiaCount = Db::name('order_merchant')->where($dayWhere)->where('paid', 1)->where('uid', 0)->count();
+
+        //商户数量
+        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$dayWhere}");
+        $merchantCount = $maker[0]['count'] ?? 0;
+
         $orderNum = $repository->dayOrderNum('today');
         $yesterdayNum = $repository->dayOrderNum('yesterday');
         $today = $repository->dayOrderNumGroup('today')->toArray();
@@ -177,7 +206,11 @@ class Common extends BaseController
             ];
         }
         $today = $data;
-        return app('json')->success(compact('orderNum', 'today', 'monthOrderNum', 'monthRate', 'orderRate'));
+
+        //贡献值排行
+        $gxz_users = Db::name('user')->order('contribute', 'desc')->field('uid,nickname,contribute')->limit(6)->select();
+
+        return app('json')->success(compact('today', 'todayShangCount', 'todayXiaCount', 'userDayCount', 'userHyDayCount', 'merchantCount', 'gxz_users'));
     }
 
     /**