店铺新用户报表--修改排序和优化

app/Admin/Controllers/StoreUserReportController.php

@@ -27,7 +27,7 @@ class StoreUserReportController extends AdminController
 
             $grid->store_id;
             $grid->market_id->display(function ($markrtId) {
-                $market = marketModel::find($markrtId);
+                $market = marketModel::select('id','name')->find($markrtId);
                 if (!$market) {
                     return '<span style="color: red">数据错误</span>';
                 }
@@ -35,7 +35,7 @@ class StoreUserReportController extends AdminController
             });
             $grid->store_name;
             // $grid->mm_user_id->display(function ($markrtId) {
-            //     return '未关联';
+            //     return '未关联市场经理';
             // });
             $grid->new_user_total;
         

app/Admin/Repositories/StoreUserReport.php

@@ -24,46 +24,18 @@ class StoreUserReport extends EloquentRepository
     */
     public function get(GridModel $model)
     {
-
-        $startTime = '2020-06-01';$endTime = '2020-08-01';
         $this->setSort($model);
         $this->setPaginate($model);
 
-        //根据订单查询 方法查询出来的数据不对
-        // $orderModel  = new orderModel();
-        // $query = $orderModel::join('ims_cjdc_store as store','order.store_id','store.id')
-        //     ->join('ims_cjdc_user as user','order.user_id','user.id')
-        //     ->select('store_id','store.market_id','store.name as store_name','mm_user_id',DB::raw("count(distinct order.user_id) as new_user_total"))
-        //     ->whereRaw("UNIX_TIMESTAMP(pay_time) BETWEEN UNIX_TIMESTAMP(?) AND UNIX_TIMESTAMP(?)",[$startTime,$endTime])
-        //     ->whereRaw("join_time BETWEEN UNIX_TIMESTAMP(?) AND UNIX_TIMESTAMP(?)",[$startTime,$endTime])
-        //     ->groupBy('store_id')
-        //     ->orderBy('market_id','desc')
-        //     ->orderBY('new_user_total','desc');
-
-        /* 根据流水查询 2020-08-18 目前用全匹配文字方式查询新用户，后期维护店铺流水表的类型（category）后再换，或者使用其他方法 */
+        /* 根据流水查询 2020-08-18 目前用全匹配文字方式查询新用户 */
         $storeAccountModel = new storeAccountModel();
         $query = $storeAccountModel::join('ims_cjdc_store as store','ims_cjdc_store_account.store_id','store.id')
-            // with(['store' => function($query){
-            //     $query->select('id','market_id','name as store_name','mm_user_id');
-            // }])
             ->select('store_id','store.market_id','store.name as store_name','mm_user_id',DB::raw("count(distinct ims_cjdc_store_account.id) as new_user_total"))
             ->whereRaw("note = '新用户下单成功，平台奖励'")
-            // ->whereRaw("UNIX_TIMESTAMP(account.time) BETWEEN UNIX_TIMESTAMP(?) AND UNIX_TIMESTAMP(?)",[$startTime,$endTime])
             ->groupBy('store_id')
             ->orderBy('store.market_id','desc')
-            ->orderBY('new_user_total','desc');
-
-        // $storeModel = new storeModel();
-        // $query = $storeModel
-        //         ->with(['storeAccount'=>function($query){
-        //             $query->where('note',"新用户下单成功，平台奖励")
-        //             ->select(DB::raw("count(distinct id) as new_user_total"));
-        //         }])
-        //         ->select('id as store_id','market_id','name as store_name','mm_user_id')
-        //         ->groupBy('id')
-        //         ->orderBy('market_id','desc')
-        //         ->orderBY('new_user_total','desc')
-        //         ;
+            ->orderBY('new_user_total','desc')
+            ->orderBY('store_id','desc');
 
         $model->getQueries()->unique()->each(function ($value) use (&$query) {
             if ($value['method'] == 'paginate') {

resources/lang/zh-CN/store-user-report.php

@@ -7,8 +7,6 @@ return [
     'fields' => [
         'store_id' => '店铺ID',
         'market_id' => '所属市场',
-        'name' => '商家名称',
-        'store.name' => '商家名称',
         'store_name' => '商家名称',
         'new_user_total' => '新增用户总数',
         'mm_user_id' => '所属市场经理',