Merge branch 'store_user_report' into develop

# Conflicts:
#	app/Admin/routes.php

app/Admin/Controllers/StoreUserReportController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\StoreUserReport;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+use App\Models\ImsCjdcMarket as marketModel;
+
+class StoreUserReportController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new StoreUserReport(), function (Grid $grid) {
+            $grid->disableCreateButton();
+            $grid->disableDeleteButton();
+            $grid->disableEditButton();
+            $grid->disableQuickEditButton();
+            $grid->disableViewButton();
+
+            $grid->store_id;
+            $grid->market_id->display(function ($markrtId) {
+                $market = marketModel::select('id','name')->find($markrtId);
+                if (!$market) {
+                    return '<span style="color: red">数据错误</span>';
+                }
+                return $market->name;
+            });
+            $grid->store_name;
+            // $grid->mm_user_id->display(function ($markrtId) {
+            //     return '未关联市场经理';
+            // });
+            $grid->new_user_total;
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $marketList = [];
+                $list = marketModel::select('id','name')->get()->toArray();
+                foreach($list as $value){
+                    $marketList[$value['id']] = $value['name'];
+                }
+                $filter->in('market_id')->multipleSelect($marketList);
+                $filter->like('store.name','店铺名称');
+                $filter->whereBetween('time', function ($q) {
+                    $start = $this->input['start'] ?? null;
+                    $end = $this->input['end'] ?? null;
+                    if ($start !== null) {
+                        $q->whereRaw('add_time >= UNIX_TIMESTAMP(?)',$start);
+                    }
+                    if ($end !== null) {
+                        $q->whereRaw('add_time <= UNIX_TIMESTAMP(?)',$end);
+                    }
+                })->datetime();
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new StoreUserReport(), function (Show $show) {
+            $show->id;
+            $show->market_id;
+            $show->name;
+            $show->mm_user_id;
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new StoreUserReport(), function (Form $form) {
+            $form->display('id');
+            $form->text('market_id');
+            $form->text('name');
+            $form->text('mm_user_id');
+        });
+    }
+}

app/Admin/Repositories/ImsCjdcOrderMain.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\ImsCjdcOrderMain as Model;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class ImsCjdcOrderMain extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+
+    public function get(Grid\Model $model)
+    {
+        $builder = new \App\Models\ImsCjdcOrderMain();
+        $builder = $builder::leftJoin('ims_cjdc_user','ims_cjdc_user.id','ims_cjdc_order_main.user_id')
+            ->with('market')
+            ->select('ims_cjdc_order_main.*','ims_cjdc_user.name as user_name')
+            ->where('type',1)
+            ->orderBy('ims_cjdc_order_main.id','desc');//只取线上订单数据
+
+        $this->setSort($model);
+        $this->setPaginate($model);
+
+        $query = $builder;
+        $model->getQueries()->unique()->each(function ($value) use (&$query) {
+            if ($value['method'] == 'paginate') {
+                $value['arguments'][1] = $this->getGridColumns();
+            } elseif ($value['method'] == 'get') {
+                $value['arguments'] = [$this->getGridColumns()];
+            }
+            $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
+        });
+
+        $query = $query->toArray();
+        foreach ($query['data'] as &$value){
+            if ($value['state']==3&&$value['order_shipping_code']==1){
+                $value['state'] = 31;
+            }
+        }
+
+        $query = $model->makePaginator($query['total'],$query['data']);
+        return $query;
+    }
+}

app/Admin/Repositories/StoreUserReport.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\storeUserReport as Model;
+use Dcat\Admin\Grid\Model as GridModel;
+use Dcat\Admin\Repositories\EloquentRepository;
+use App\Models\ImsCjdcOrder as orderModel;
+use App\Models\StoreAccount as storeAccountModel;
+use App\Models\ImsCjdcStore as storeModel;
+use Illuminate\Support\Facades\DB;
+
+class StoreUserReport extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+
+    /**
+     * 获取统计列表数据
+    */
+    public function get(GridModel $model)
+    {
+        $this->setSort($model);
+        $this->setPaginate($model);
+
+        /* 根据流水查询 2020-08-18 目前用全匹配文字方式查询新用户 */
+        $storeAccountModel = new storeAccountModel();
+        $query = $storeAccountModel::join('ims_cjdc_store as store','ims_cjdc_store_account.store_id','store.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 = '新用户下单成功，平台奖励'")
+            ->groupBy('store_id')
+            ->orderBy('store.market_id','desc')
+            ->orderBY('new_user_total','desc')
+            ->orderBY('store_id','desc');
+
+        $model->getQueries()->unique()->each(function ($value) use (&$query) {
+            if ($value['method'] == 'paginate') {
+                $value['arguments'][1] = $this->getGridColumns();
+            } elseif ($value['method'] == 'get') {
+                $value['arguments'] = [$this->getGridColumns()];
+            }
+            $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
+        });
+
+        $query = $query->toArray();
+
+        $query = $model->makePaginator($query['total'],$query['data']);
+        return $query;
+    }
+}

app/Admin/routes.php

@@ -29,12 +29,13 @@ Route::group([
 
     $router->get('/coupon/TieForm', 'CouponTieController@CouponTieForm');
     $router->get('/couponTie', 'CouponTieController@CouponTieList');
-    $router->get('/couponSetting', 'couponSetting@grid');
+    $router->resource('/couponSetting', 'couponSettingController');
 
     //获取所有市场
     $router->any('/api/getAllMarket', 'LanzuServiceSpeakerController@getAllMarkets');
 
     //根据市场id，商户名查询商户
     $router->any('/api/stores', 'LanzuServiceSpeakerController@getStores');
-
+    //统计店铺新增用户
+    $router->resource('/storeUserReport', 'StoreUserReportController');
 });

app/Models/CouponSetting.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 class CouponSetting extends Model
 {
 	use HasDateTimeFormatter;
-    use SoftDeletes;
+    // use SoftDeletes;
 
     protected $table = 'ims_system_coupon_setting';
     

app/Models/ImsCjdcOrder.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ImsCjdcOrder extends Model
+{
+	use HasDateTimeFormatter;
+    protected $table = 'ims_cjdc_order as order';
+    public $timestamps = false;
+
+    public function user()
+    {
+        return $this->hasOne('\App\Models\ImsCjdcUser','id','user_id');
+    }
+
+    public function store()
+    {
+        return $this->hasOne('\App\Models\ImsCjdcStore','id','store_id');
+    }
+
+}

app/Models/ImsCjdcOrderMain.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+
+class ImsCjdcOrderMain extends Model
+{
+	use HasDateTimeFormatter;
+    protected $table = 'ims_cjdc_order_main';
+    public $timestamps = false;
+
+    public function imsCjdcUser()
+    {
+        return $this->hasOne('\App\Models\ImsCjdcUser','id','user_id');
+    }
+
+    public function market()
+    {
+        return $this->hasOne('\App\Models\ImsCjdcMarket','id','market_id');
+    }
+
+    /**
+     * 同时变更主订单和子订单状态,
+     * @param $oid  //主订单id
+     * @param $state //订单状态
+     */
+    public function modifyState($oid,$state)
+    {
+        return DB::transaction(function () use ($oid,$state){
+            $data1['state']       = $data2['state'] = $state;
+            $data1['update_time'] = time();
+            if ($state == 4) {
+                $data1['complete_time'] = $data2['complete_time'] = time();
+
+            } elseif ($state == 3) {
+                $data1['jd_time'] = $data2['jd_time'] = time();
+            }
+            DB::table('ims_cjdc_order_main')
+                ->where('id',$oid)
+                ->update($data1);
+            DB::table('ims_cjdc_order')
+                ->where('order_main_id',$oid)
+                ->update($data2);
+            if ($state==4){
+                //添加店铺流水记录
+                $account = new StoreAccount();
+                $account->addStoreAccount($oid);
+            }
+            return true;
+        });
+
+    }
+}

app/Models/ImsCjdcStore.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 
 use Illuminate\Database\Eloquent\Model;
+use App\Models\StoreAccount;
 
 class ImsCjdcStore extends Model
 {
@@ -14,4 +15,8 @@ class ImsCjdcStore extends Model
     public function market(){
         return $this->hasOne('\App\Models\ImsCjdcMarket','id','market_id');
     }
+    
+    public function storeAccount(){
+        return $this->hasMany(StoreAccount::class,'store_id','id');
+    }
 }

app/Models/StoreAccount.php

@@ -0,0 +1,53 @@
+<?php
+
+
+namespace App\Models;
+
+
+
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+use App\Models\ImsCjdcStore as storeModel;
+
+class StoreAccount extends Model
+{
+    use HasDateTimeFormatter;
+    protected $table = 'ims_cjdc_store_account';
+    protected $dateFormat = 'U';
+    public $timestamps = false;
+
+    /**
+     * 添加店铺流水
+     * @param $oid //主订单id
+     */
+    public function addStoreAccount($oid,$type=1,$note='线上订单')
+    {
+        $accountData = $data = [];
+        $orderData = DB::table('ims_cjdc_order')->where('order_main_id',$oid)->get()->toArray();
+
+        if (count($orderData)) {
+            foreach ($orderData as $item) {
+                if (is_object($item)){
+                    $accountData['user_id']  = $item->user_id;
+                    $accountData['order_id'] = $item->id;
+                    $accountData['store_id'] = $item->store_id;
+                    $accountData['money']    = $item->money;
+                    $accountData['type']     = $type;
+                    $accountData['note']     = $note;
+                    $accountData['add_time'] = time();
+                    $accountData['time']     = date('Y-m-d H:i:s', time());
+                    $data[]                  = $accountData;
+                }
+            }
+            return DB::table('ims_cjdc_store_account')->insert($data);
+        } else {
+            return false;
+        }
+    }
+
+    public function store(){
+        return $this->hasMany(storeModel::class,'id','store_id');
+    }
+}

app/Models/storeUserReport.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class storeUserReport extends Model
+{
+	use HasDateTimeFormatter;
+    protected $table = 'ims_cjdc_store';
+    public $timestamps = false;
+
+}

composer.lock

@@ -2131,6 +2131,12 @@
                 "wechat",
                 "weibo"
             ],
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/overtrue",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-03-04T15:22:25+00:00"
         },
         {
@@ -2204,6 +2210,20 @@
                 "weixin",
                 "weixin-sdk"
             ],
+            "funding": [
+                {
+                    "url": "https://www.easywechat.com/img/pay/wechat.jpg",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/overtrue",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/overtrue",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-07-29T07:36:50+00:00"
         },
         {
@@ -3183,6 +3203,20 @@
                 "caching",
                 "psr6"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-23T17:22:30+00:00"
         },
         {
@@ -3251,6 +3285,20 @@
                 "interoperability",
                 "standards"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-07-06T13:23:11+00:00"
         },
         {
@@ -4850,6 +4898,20 @@
                 "psr-17",
                 "psr-7"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-06-25T08:21:47+00:00"
         },
         {
@@ -5379,6 +5441,20 @@
                 "instantiate",
                 "serialize"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-06-07T15:42:22+00:00"
         },
         {
@@ -7789,5 +7865,6 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

config/debugbar.php

@@ -0,0 +1,215 @@
+<?php
+
+return [
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar Settings
+     |--------------------------------------------------------------------------
+     |
+     | Debugbar is enabled by default, when debug is set to true in app.php.
+     | You can override the value by setting enable to true or false instead of null.
+     |
+     | You can provide an array of URI's that must be ignored (eg. 'api/*')
+     |
+     */
+
+    'enabled' => env('DEBUGBAR_ENABLED', true),
+    'except' => [
+        'telescope*',
+        'horizon*'
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Storage settings
+     |--------------------------------------------------------------------------
+     |
+     | DebugBar stores data for session/ajax requests.
+     | You can disable this, so the debugbar stores data in headers/session,
+     | but this can cause problems with large data collectors.
+     | By default, file storage (in the storage folder) is used. Redis and PDO
+     | can also be used. For PDO, run the package migrations first.
+     |
+     */
+    'storage' => [
+        'enabled'    => true,
+        'driver'     => 'file', // redis, file, pdo, custom
+        'path'       => storage_path('debugbar'), // For file driver
+        'connection' => null,   // Leave null for default connection (Redis/PDO)
+        'provider'   => '' // Instance of StorageInterface for custom driver
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Vendors
+     |--------------------------------------------------------------------------
+     |
+     | Vendor files are included by default, but can be set to false.
+     | This can also be set to 'js' or 'css', to only include javascript or css vendor files.
+     | Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
+     | and for js: jquery and and highlight.js
+     | So if you want syntax highlighting, set it to true.
+     | jQuery is set to not conflict with existing jQuery scripts.
+     |
+     */
+
+    'include_vendors' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Ajax Requests
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
+     | you can use this option to disable sending the data through the headers.
+     |
+     | Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
+     */
+
+    'capture_ajax' => true,
+    'add_ajax_timing' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Custom Error Handler for Deprecated warnings
+     |--------------------------------------------------------------------------
+     |
+     | When enabled, the Debugbar shows deprecated warnings for Symfony components
+     | in the Messages tab.
+     |
+     */
+    'error_handler' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Clockwork integration
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can emulate the Clockwork headers, so you can use the Chrome
+     | Extension, without the server-side code. It uses Debugbar collectors instead.
+     |
+     */
+    'clockwork' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DataCollectors
+     |--------------------------------------------------------------------------
+     |
+     | Enable/disable DataCollectors
+     |
+     */
+
+    'collectors' => [
+        'phpinfo'         => true,  // Php version
+        'messages'        => true,  // Messages
+        'time'            => true,  // Time Datalogger
+        'memory'          => true,  // Memory usage
+        'exceptions'      => true,  // Exception displayer
+        'log'             => true,  // Logs from Monolog (merged in messages if enabled)
+        'db'              => true,  // Show database (PDO) queries and bindings
+        'views'           => true,  // Views with their data
+        'route'           => true,  // Current route information
+        'auth'            => false, // Display Laravel authentication status
+        'gate'            => true,  // Display Laravel Gate checks
+        'session'         => true,  // Display session data
+        'symfony_request' => true,  // Only one can be enabled..
+        'mail'            => true,  // Catch mail messages
+        'laravel'         => false, // Laravel version and environment
+        'events'          => false, // All events fired
+        'default_request' => false, // Regular or special Symfony request logger
+        'logs'            => false, // Add the latest log messages
+        'files'           => false, // Show the included files
+        'config'          => false, // Display config settings
+        'cache'           => false, // Display cache events
+        'models'          => true,  // Display models
+        'livewire'        => true,  // Display Livewire (when available)
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Extra options
+     |--------------------------------------------------------------------------
+     |
+     | Configure some DataCollectors
+     |
+     */
+
+    'options' => [
+        'auth' => [
+            'show_name' => true,   // Also show the users name/email in the debugbar
+        ],
+        'db' => [
+            'with_params'       => true,   // Render SQL with the parameters substituted
+            'backtrace'         => true,   // Use a backtrace to find the origin of the query in your files.
+            'backtrace_exclude_paths' => [],   // Paths to exclude from backtrace. (in addition to defaults)
+            'timeline'          => false,  // Add the queries to the timeline
+            'explain' => [                 // Show EXPLAIN output on queries
+                'enabled' => false,
+                'types' => ['SELECT'],     // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
+            ],
+            'hints'             => false,    // Show hints for common mistakes
+        ],
+        'mail' => [
+            'full_log' => false
+        ],
+        'views' => [
+            'data' => false,    //Note: Can slow down the application, because the data can be quite large..
+        ],
+        'route' => [
+            'label' => true  // show complete route on bar
+        ],
+        'logs' => [
+            'file' => null
+        ],
+        'cache' => [
+            'values' => true // collect cache values
+        ],
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Inject Debugbar in Response
+     |--------------------------------------------------------------------------
+     |
+     | Usually, the debugbar is added just before </body>, by listening to the
+     | Response after the App is done. If you disable this, you have to add them
+     | in your template yourself. See http://phpdebugbar.com/docs/rendering.html
+     |
+     */
+
+    'inject' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar route prefix
+     |--------------------------------------------------------------------------
+     |
+     | Sometimes you want to set route prefix to be used by DebugBar to load
+     | its resources from. Usually the need comes from misconfigured web server or
+     | from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
+     |
+     */
+    'route_prefix' => '_debugbar',
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar route domain
+     |--------------------------------------------------------------------------
+     |
+     | By default DebugBar route served from the same domain that request served.
+     | To override default domain, specify it as a non-empty value.
+     */
+    'route_domain' => null,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar theme
+     |--------------------------------------------------------------------------
+     |
+     | Switches between light and dark theme. If set to auto it will respect system preferences
+     | Possible values: auto, light, dark
+     */
+    'theme' => 'auto',
+];

dcat_admin_ide_helper.php

@@ -40,10 +40,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection bank_name
      * @property Grid\Column|Collection bank_card
      * @property Grid\Column|Collection bank_addr
-     * @property Grid\Column|Collection admin_user_id
      * @property Grid\Column|Collection status
      * @property Grid\Column|Collection market_id
-     * @property Grid\Column|Collection is_del
      * @property Grid\Column|Collection logo
      * @property Grid\Column|Collection address
      * @property Grid\Column|Collection introduce
@@ -56,11 +54,15 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection dn_poundage
      * @property Grid\Column|Collection dm_poundage
      * @property Grid\Column|Collection yd_poundage
-     * @property Grid\Column|Collection dada_number
-     * @property Grid\Column|Collection is_open_dada
      * @property Grid\Column|Collection loudspeaker_imei
      * @property Grid\Column|Collection dishes_menu_intro
      * @property Grid\Column|Collection create_time
+     * @property Grid\Column|Collection tel
+     * @property Grid\Column|Collection is_rest
+     * @property Grid\Column|Collection award_money
+     * @property Grid\Column|Collection img
+     * @property Grid\Column|Collection start_at
+     * @property Grid\Column|Collection freight
      * @property Grid\Column|Collection money
      * @property Grid\Column|Collection mp_id
      * @property Grid\Column|Collection is_pay
@@ -253,7 +255,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection area_name
      * @property Grid\Column|Collection num
      * @property Grid\Column|Collection store_id
-     * @property Grid\Column|Collection img
      * @property Grid\Column|Collection stars
      * @property Grid\Column|Collection time
      * @property Grid\Column|Collection order_id
@@ -391,6 +392,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection waimai_pay_temp
      * @property Grid\Column|Collection dangmian_pay_temp
      * @property Grid\Column|Collection ziti_pay_temp
+     * @property Grid\Column|Collection dada_number
+     * @property Grid\Column|Collection is_open_dada
      * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection sender
      * @property Grid\Column|Collection is_email
@@ -441,7 +444,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection ps_money
      * @property Grid\Column|Collection mj_money
      * @property Grid\Column|Collection xyh_money
-     * @property Grid\Column|Collection tel
      * @property Grid\Column|Collection jj_note
      * @property Grid\Column|Collection area
      * @property Grid\Column|Collection del
@@ -488,6 +490,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection total_money
      * @property Grid\Column|Collection dada_status
      * @property Grid\Column|Collection print_num
+     * @property Grid\Column|Collection global_order_id
      * @property Grid\Column|Collection mchid
      * @property Grid\Column|Collection wxkey
      * @property Grid\Column|Collection apiclient_cert
@@ -531,9 +534,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection sss_shop_token
      * @property Grid\Column|Collection time4
      * @property Grid\Column|Collection announcement
-     * @property Grid\Column|Collection is_rest
-     * @property Grid\Column|Collection start_at
-     * @property Grid\Column|Collection freight
      * @property Grid\Column|Collection yyzz
      * @property Grid\Column|Collection md_area
      * @property Grid\Column|Collection md_type
@@ -560,7 +560,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection store_mchid
      * @property Grid\Column|Collection cash_code
      * @property Grid\Column|Collection store_wallet
-     * @property Grid\Column|Collection award_money
      * @property Grid\Column|Collection mm_user_id
      * @property Grid\Column|Collection add_time
      * @property Grid\Column|Collection category
@@ -709,6 +708,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection order_money
      * @property Grid\Column|Collection order_number
      * @property Grid\Column|Collection hy_day
+     * @property Grid\Column|Collection unionid
      * @property Grid\Column|Collection is_default
      * @property Grid\Column|Collection yhk_num
      * @property Grid\Column|Collection yh_info
@@ -843,7 +843,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection language
      * @property Grid\Column|Collection headimgurl
      * @property Grid\Column|Collection subscribe_time
-     * @property Grid\Column|Collection unionid
      * @property Grid\Column|Collection groupid
      * @property Grid\Column|Collection tagid_list
      * @property Grid\Column|Collection subscribe_scene
@@ -1157,6 +1156,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection money_type
      * @property Grid\Column|Collection source_type
      * @property Grid\Column|Collection comment
+     * @property Grid\Column|Collection admin_user_id
+     * @property Grid\Column|Collection is_del
      * @property Grid\Column|Collection balance
      * @property Grid\Column|Collection is_operated
      * @property Grid\Column|Collection c_attitude
@@ -1202,10 +1203,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection bank_name(string $label = null)
      * @method Grid\Column|Collection bank_card(string $label = null)
      * @method Grid\Column|Collection bank_addr(string $label = null)
-     * @method Grid\Column|Collection admin_user_id(string $label = null)
      * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection market_id(string $label = null)
-     * @method Grid\Column|Collection is_del(string $label = null)
      * @method Grid\Column|Collection logo(string $label = null)
      * @method Grid\Column|Collection address(string $label = null)
      * @method Grid\Column|Collection introduce(string $label = null)
@@ -1218,11 +1217,15 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection dn_poundage(string $label = null)
      * @method Grid\Column|Collection dm_poundage(string $label = null)
      * @method Grid\Column|Collection yd_poundage(string $label = null)
-     * @method Grid\Column|Collection dada_number(string $label = null)
-     * @method Grid\Column|Collection is_open_dada(string $label = null)
      * @method Grid\Column|Collection loudspeaker_imei(string $label = null)
      * @method Grid\Column|Collection dishes_menu_intro(string $label = null)
      * @method Grid\Column|Collection create_time(string $label = null)
+     * @method Grid\Column|Collection tel(string $label = null)
+     * @method Grid\Column|Collection is_rest(string $label = null)
+     * @method Grid\Column|Collection award_money(string $label = null)
+     * @method Grid\Column|Collection img(string $label = null)
+     * @method Grid\Column|Collection start_at(string $label = null)
+     * @method Grid\Column|Collection freight(string $label = null)
      * @method Grid\Column|Collection money(string $label = null)
      * @method Grid\Column|Collection mp_id(string $label = null)
      * @method Grid\Column|Collection is_pay(string $label = null)
@@ -1415,7 +1418,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection area_name(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
      * @method Grid\Column|Collection store_id(string $label = null)
-     * @method Grid\Column|Collection img(string $label = null)
      * @method Grid\Column|Collection stars(string $label = null)
      * @method Grid\Column|Collection time(string $label = null)
      * @method Grid\Column|Collection order_id(string $label = null)
@@ -1553,6 +1555,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection waimai_pay_temp(string $label = null)
      * @method Grid\Column|Collection dangmian_pay_temp(string $label = null)
      * @method Grid\Column|Collection ziti_pay_temp(string $label = null)
+     * @method Grid\Column|Collection dada_number(string $label = null)
+     * @method Grid\Column|Collection is_open_dada(string $label = null)
      * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection sender(string $label = null)
      * @method Grid\Column|Collection is_email(string $label = null)
@@ -1603,7 +1607,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection ps_money(string $label = null)
      * @method Grid\Column|Collection mj_money(string $label = null)
      * @method Grid\Column|Collection xyh_money(string $label = null)
-     * @method Grid\Column|Collection tel(string $label = null)
      * @method Grid\Column|Collection jj_note(string $label = null)
      * @method Grid\Column|Collection area(string $label = null)
      * @method Grid\Column|Collection del(string $label = null)
@@ -1650,6 +1653,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection total_money(string $label = null)
      * @method Grid\Column|Collection dada_status(string $label = null)
      * @method Grid\Column|Collection print_num(string $label = null)
+     * @method Grid\Column|Collection global_order_id(string $label = null)
      * @method Grid\Column|Collection mchid(string $label = null)
      * @method Grid\Column|Collection wxkey(string $label = null)
      * @method Grid\Column|Collection apiclient_cert(string $label = null)
@@ -1693,9 +1697,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection sss_shop_token(string $label = null)
      * @method Grid\Column|Collection time4(string $label = null)
      * @method Grid\Column|Collection announcement(string $label = null)
-     * @method Grid\Column|Collection is_rest(string $label = null)
-     * @method Grid\Column|Collection start_at(string $label = null)
-     * @method Grid\Column|Collection freight(string $label = null)
      * @method Grid\Column|Collection yyzz(string $label = null)
      * @method Grid\Column|Collection md_area(string $label = null)
      * @method Grid\Column|Collection md_type(string $label = null)
@@ -1722,7 +1723,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection store_mchid(string $label = null)
      * @method Grid\Column|Collection cash_code(string $label = null)
      * @method Grid\Column|Collection store_wallet(string $label = null)
-     * @method Grid\Column|Collection award_money(string $label = null)
      * @method Grid\Column|Collection mm_user_id(string $label = null)
      * @method Grid\Column|Collection add_time(string $label = null)
      * @method Grid\Column|Collection category(string $label = null)
@@ -1871,6 +1871,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection order_money(string $label = null)
      * @method Grid\Column|Collection order_number(string $label = null)
      * @method Grid\Column|Collection hy_day(string $label = null)
+     * @method Grid\Column|Collection unionid(string $label = null)
      * @method Grid\Column|Collection is_default(string $label = null)
      * @method Grid\Column|Collection yhk_num(string $label = null)
      * @method Grid\Column|Collection yh_info(string $label = null)
@@ -2005,7 +2006,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection language(string $label = null)
      * @method Grid\Column|Collection headimgurl(string $label = null)
      * @method Grid\Column|Collection subscribe_time(string $label = null)
-     * @method Grid\Column|Collection unionid(string $label = null)
      * @method Grid\Column|Collection groupid(string $label = null)
      * @method Grid\Column|Collection tagid_list(string $label = null)
      * @method Grid\Column|Collection subscribe_scene(string $label = null)
@@ -2319,6 +2319,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection money_type(string $label = null)
      * @method Grid\Column|Collection source_type(string $label = null)
      * @method Grid\Column|Collection comment(string $label = null)
+     * @method Grid\Column|Collection admin_user_id(string $label = null)
+     * @method Grid\Column|Collection is_del(string $label = null)
      * @method Grid\Column|Collection balance(string $label = null)
      * @method Grid\Column|Collection is_operated(string $label = null)
      * @method Grid\Column|Collection c_attitude(string $label = null)
@@ -2369,10 +2371,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection bank_name
      * @property Show\Field|Collection bank_card
      * @property Show\Field|Collection bank_addr
-     * @property Show\Field|Collection admin_user_id
      * @property Show\Field|Collection status
      * @property Show\Field|Collection market_id
-     * @property Show\Field|Collection is_del
      * @property Show\Field|Collection logo
      * @property Show\Field|Collection address
      * @property Show\Field|Collection introduce
@@ -2385,11 +2385,15 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection dn_poundage
      * @property Show\Field|Collection dm_poundage
      * @property Show\Field|Collection yd_poundage
-     * @property Show\Field|Collection dada_number
-     * @property Show\Field|Collection is_open_dada
      * @property Show\Field|Collection loudspeaker_imei
      * @property Show\Field|Collection dishes_menu_intro
      * @property Show\Field|Collection create_time
+     * @property Show\Field|Collection tel
+     * @property Show\Field|Collection is_rest
+     * @property Show\Field|Collection award_money
+     * @property Show\Field|Collection img
+     * @property Show\Field|Collection start_at
+     * @property Show\Field|Collection freight
      * @property Show\Field|Collection money
      * @property Show\Field|Collection mp_id
      * @property Show\Field|Collection is_pay
@@ -2582,7 +2586,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection area_name
      * @property Show\Field|Collection num
      * @property Show\Field|Collection store_id
-     * @property Show\Field|Collection img
      * @property Show\Field|Collection stars
      * @property Show\Field|Collection time
      * @property Show\Field|Collection order_id
@@ -2720,6 +2723,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection waimai_pay_temp
      * @property Show\Field|Collection dangmian_pay_temp
      * @property Show\Field|Collection ziti_pay_temp
+     * @property Show\Field|Collection dada_number
+     * @property Show\Field|Collection is_open_dada
      * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection sender
      * @property Show\Field|Collection is_email
@@ -2770,7 +2775,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection ps_money
      * @property Show\Field|Collection mj_money
      * @property Show\Field|Collection xyh_money
-     * @property Show\Field|Collection tel
      * @property Show\Field|Collection jj_note
      * @property Show\Field|Collection area
      * @property Show\Field|Collection del
@@ -2817,6 +2821,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection total_money
      * @property Show\Field|Collection dada_status
      * @property Show\Field|Collection print_num
+     * @property Show\Field|Collection global_order_id
      * @property Show\Field|Collection mchid
      * @property Show\Field|Collection wxkey
      * @property Show\Field|Collection apiclient_cert
@@ -2860,9 +2865,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection sss_shop_token
      * @property Show\Field|Collection time4
      * @property Show\Field|Collection announcement
-     * @property Show\Field|Collection is_rest
-     * @property Show\Field|Collection start_at
-     * @property Show\Field|Collection freight
      * @property Show\Field|Collection yyzz
      * @property Show\Field|Collection md_area
      * @property Show\Field|Collection md_type
@@ -2889,7 +2891,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection store_mchid
      * @property Show\Field|Collection cash_code
      * @property Show\Field|Collection store_wallet
-     * @property Show\Field|Collection award_money
      * @property Show\Field|Collection mm_user_id
      * @property Show\Field|Collection add_time
      * @property Show\Field|Collection category
@@ -3038,6 +3039,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection order_money
      * @property Show\Field|Collection order_number
      * @property Show\Field|Collection hy_day
+     * @property Show\Field|Collection unionid
      * @property Show\Field|Collection is_default
      * @property Show\Field|Collection yhk_num
      * @property Show\Field|Collection yh_info
@@ -3172,7 +3174,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection language
      * @property Show\Field|Collection headimgurl
      * @property Show\Field|Collection subscribe_time
-     * @property Show\Field|Collection unionid
      * @property Show\Field|Collection groupid
      * @property Show\Field|Collection tagid_list
      * @property Show\Field|Collection subscribe_scene
@@ -3486,6 +3487,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection money_type
      * @property Show\Field|Collection source_type
      * @property Show\Field|Collection comment
+     * @property Show\Field|Collection admin_user_id
+     * @property Show\Field|Collection is_del
      * @property Show\Field|Collection balance
      * @property Show\Field|Collection is_operated
      * @property Show\Field|Collection c_attitude
@@ -3531,10 +3534,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection bank_name(string $label = null)
      * @method Show\Field|Collection bank_card(string $label = null)
      * @method Show\Field|Collection bank_addr(string $label = null)
-     * @method Show\Field|Collection admin_user_id(string $label = null)
      * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection market_id(string $label = null)
-     * @method Show\Field|Collection is_del(string $label = null)
      * @method Show\Field|Collection logo(string $label = null)
      * @method Show\Field|Collection address(string $label = null)
      * @method Show\Field|Collection introduce(string $label = null)
@@ -3547,11 +3548,15 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection dn_poundage(string $label = null)
      * @method Show\Field|Collection dm_poundage(string $label = null)
      * @method Show\Field|Collection yd_poundage(string $label = null)
-     * @method Show\Field|Collection dada_number(string $label = null)
-     * @method Show\Field|Collection is_open_dada(string $label = null)
      * @method Show\Field|Collection loudspeaker_imei(string $label = null)
      * @method Show\Field|Collection dishes_menu_intro(string $label = null)
      * @method Show\Field|Collection create_time(string $label = null)
+     * @method Show\Field|Collection tel(string $label = null)
+     * @method Show\Field|Collection is_rest(string $label = null)
+     * @method Show\Field|Collection award_money(string $label = null)
+     * @method Show\Field|Collection img(string $label = null)
+     * @method Show\Field|Collection start_at(string $label = null)
+     * @method Show\Field|Collection freight(string $label = null)
      * @method Show\Field|Collection money(string $label = null)
      * @method Show\Field|Collection mp_id(string $label = null)
      * @method Show\Field|Collection is_pay(string $label = null)
@@ -3744,7 +3749,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection area_name(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
      * @method Show\Field|Collection store_id(string $label = null)
-     * @method Show\Field|Collection img(string $label = null)
      * @method Show\Field|Collection stars(string $label = null)
      * @method Show\Field|Collection time(string $label = null)
      * @method Show\Field|Collection order_id(string $label = null)
@@ -3882,6 +3886,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection waimai_pay_temp(string $label = null)
      * @method Show\Field|Collection dangmian_pay_temp(string $label = null)
      * @method Show\Field|Collection ziti_pay_temp(string $label = null)
+     * @method Show\Field|Collection dada_number(string $label = null)
+     * @method Show\Field|Collection is_open_dada(string $label = null)
      * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection sender(string $label = null)
      * @method Show\Field|Collection is_email(string $label = null)
@@ -3932,7 +3938,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection ps_money(string $label = null)
      * @method Show\Field|Collection mj_money(string $label = null)
      * @method Show\Field|Collection xyh_money(string $label = null)
-     * @method Show\Field|Collection tel(string $label = null)
      * @method Show\Field|Collection jj_note(string $label = null)
      * @method Show\Field|Collection area(string $label = null)
      * @method Show\Field|Collection del(string $label = null)
@@ -3979,6 +3984,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection total_money(string $label = null)
      * @method Show\Field|Collection dada_status(string $label = null)
      * @method Show\Field|Collection print_num(string $label = null)
+     * @method Show\Field|Collection global_order_id(string $label = null)
      * @method Show\Field|Collection mchid(string $label = null)
      * @method Show\Field|Collection wxkey(string $label = null)
      * @method Show\Field|Collection apiclient_cert(string $label = null)
@@ -4022,9 +4028,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection sss_shop_token(string $label = null)
      * @method Show\Field|Collection time4(string $label = null)
      * @method Show\Field|Collection announcement(string $label = null)
-     * @method Show\Field|Collection is_rest(string $label = null)
-     * @method Show\Field|Collection start_at(string $label = null)
-     * @method Show\Field|Collection freight(string $label = null)
      * @method Show\Field|Collection yyzz(string $label = null)
      * @method Show\Field|Collection md_area(string $label = null)
      * @method Show\Field|Collection md_type(string $label = null)
@@ -4051,7 +4054,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection store_mchid(string $label = null)
      * @method Show\Field|Collection cash_code(string $label = null)
      * @method Show\Field|Collection store_wallet(string $label = null)
-     * @method Show\Field|Collection award_money(string $label = null)
      * @method Show\Field|Collection mm_user_id(string $label = null)
      * @method Show\Field|Collection add_time(string $label = null)
      * @method Show\Field|Collection category(string $label = null)
@@ -4200,6 +4202,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection order_money(string $label = null)
      * @method Show\Field|Collection order_number(string $label = null)
      * @method Show\Field|Collection hy_day(string $label = null)
+     * @method Show\Field|Collection unionid(string $label = null)
      * @method Show\Field|Collection is_default(string $label = null)
      * @method Show\Field|Collection yhk_num(string $label = null)
      * @method Show\Field|Collection yh_info(string $label = null)
@@ -4334,7 +4337,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection language(string $label = null)
      * @method Show\Field|Collection headimgurl(string $label = null)
      * @method Show\Field|Collection subscribe_time(string $label = null)
-     * @method Show\Field|Collection unionid(string $label = null)
      * @method Show\Field|Collection groupid(string $label = null)
      * @method Show\Field|Collection tagid_list(string $label = null)
      * @method Show\Field|Collection subscribe_scene(string $label = null)
@@ -4648,6 +4650,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection money_type(string $label = null)
      * @method Show\Field|Collection source_type(string $label = null)
      * @method Show\Field|Collection comment(string $label = null)
+     * @method Show\Field|Collection admin_user_id(string $label = null)
+     * @method Show\Field|Collection is_del(string $label = null)
      * @method Show\Field|Collection balance(string $label = null)
      * @method Show\Field|Collection is_operated(string $label = null)
      * @method Show\Field|Collection c_attitude(string $label = null)

resources/lang/zh-CN/coupon-setting.php

@@ -1,7 +1,8 @@
 <?php 
 return [
     'labels' => [
-        'CouponSetting' => 'CouponSetting',
+        'CouponSetting' => '领取方式',
+        'couponSetting' => '领取方式',
     ],
     'fields' => [
         'name' => '名称',

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

@@ -0,0 +1,17 @@
+<?php 
+return [
+    'labels' => [
+        'StoreUserReport' => '店铺新用户报表',
+        'storeUserReport' => '店铺新用户报表',
+    ],
+    'fields' => [
+        'store_id' => '店铺ID',
+        'market_id' => '所属市场',
+        'store_name' => '商家名称',
+        'new_user_total' => '新增用户总数',
+        'mm_user_id' => '所属市场经理',
+        'time' => '时间',
+    ],
+    'options' => [
+    ],
+];

storage/debugbar/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore