From 85ce13ebfe66694505757d2aa2cb6b1e5d210506 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 14 Sep 2020 17:32:24 +0800 Subject: [PATCH 01/56] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E7=BA=BF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=99=E4=B8=93=E5=91=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/QRCode.php | 34 ++++++++ .../v3/ServicePersonnelController.php | 80 +++++++++++++------ app/Admin/Controllers/v3/StoreController.php | 24 +++++- app/Models/v3/Banners.php | 2 +- app/Models/v3/Category.php | 2 +- app/Models/v3/Goods.php | 2 +- app/Models/v3/GoodsActivity.php | 2 +- app/Models/v3/GoodsNew.php | 2 +- app/Models/v3/ServicePersonnel.php | 57 ++++++++++++- app/Models/v3/Store.php | 4 +- app/Models/v3/StoreNew.php | 10 +-- config/filesystems.php | 4 +- 12 files changed, 182 insertions(+), 41 deletions(-) create mode 100644 app/Admin/Common/QRCode.php diff --git a/app/Admin/Common/QRCode.php b/app/Admin/Common/QRCode.php new file mode 100644 index 0000000..323c17d --- /dev/null +++ b/app/Admin/Common/QRCode.php @@ -0,0 +1,34 @@ +images = new Images(); + } + + /** + * 服务站专员评价小程序码 + */ + public function getServicePersonnel($id, $path) + { + $param = "page=details&id={$id}"; + $path = "zh_cjdianc/pages/Liar/loginindex"; + $codeStore = $this->images->createQrCode($param,$path); + $storeImgPath = 'QR_code/code_service_personnel_img/personnel_'.$id.'.jpg'; + $res = $this->images->uploadOss($codeStore,$storeImgPath); + if($res){ + return ['status' => true ,'path' => $storeImgPath]; + }else{ + return ['status' => false ,'path' => '']; + } + } + +} diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 338feb1..43d77e0 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -7,6 +7,9 @@ use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; +use App\Models\v3\ServicePersonnel as ServicePersonnelModel; +use App\Models\v3\Market as MarketModel; +use App\Models\v3\User as UserModel; class ServicePersonnelController extends AdminController { @@ -18,22 +21,31 @@ class ServicePersonnelController extends AdminController protected function grid() { return Grid::make(new ServicePersonnel(), function (Grid $grid) { + //市场 + $marketList = MarketModel::getMarketArray(); + $grid->column('id')->sortable(); - $grid->column('user_id'); + + $grid->column('head_url')->image('',50); $grid->column('name'); $grid->column('tel'); - $grid->column('market_id'); - $grid->column('type'); - $grid->column('status'); - $grid->column('qr_url'); - $grid->column('head_url'); - $grid->column('created_at'); - $grid->column('updated_at')->sortable(); - - $grid->filter(function (Grid\Filter $filter) { + $grid->column('market_id')->display(function($marketId) use ($marketList){ + return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; + }); + $grid->column('type_text'); + $grid->column('qr_url')->image('',50); + $grid->column('status')->using(ServicePersonnelModel::$_STATUS)->label(config('label.status_label')); + + $grid->model()->orderby('id','desc'); + + $grid->filter(function (Grid\Filter $filter) use($marketList){ $filter->equal('id'); - + $filter->like('name'); + $filter->equal('type')->select(ServicePersonnelModel::$_TYPE); + $filter->equal('market_id')->select($marketList); }); + // 每页10条 + $grid->paginate(10); }); } @@ -69,18 +81,40 @@ class ServicePersonnelController extends AdminController protected function form() { return Form::make(new ServicePersonnel(), function (Form $form) { - $form->display('id'); - $form->text('user_id'); - $form->text('name'); - $form->text('tel'); - $form->text('market_id'); - $form->text('type'); - $form->text('status'); - $form->text('qr_url'); - $form->text('head_url'); - - $form->display('created_at'); - $form->display('updated_at'); + //市场 + $marketList = MarketModel::getMarketArray(); + // 用户 + $userList = UserModel::getUserArray(); + // 已绑定的用户 + $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); + foreach($userList as $ku => $uv){ + if($ku != 0 && in_array($ku,$userHas)){ + unset($userList[$ku]); + } + } + + $form->column(6,function(Form $form){ + $form->hidden('id'); + $form->text('name')->required(); + $form->text('tel')->required(); + $form->image('head_url')->required(); + }); + $form->column(6,function(Form $form) use($marketList,$userList){ + $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); + $form->select('market_id')->options($marketList)->required(); + $form->select('user_id')->options($userList)->required(); + }); + + $form->saved(function(Form $form){ + $id = $form->getKey(); + + // 生产专员二维码 + $qrCode = 0; + }); + $form->disableResetButton(); + $form->disableViewCheck(); + $form->disableEditingCheck(); + $form->disableCreatingCheck(); }); } } diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 81b13fa..0e238ea 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -40,8 +40,24 @@ class StoreController extends AdminController $mmUser = MminfoModel::getMmInfo($mmUserId,'name'); return empty($mmUser) ? '' : $mmUser->name; }); - $grid->store_applet_img->image('',50); - $grid->cash_code_img->image('',50); + $grid->store_applet_img->display(function($appletImg){ + $id = $this->id; + $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg'; + $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; + $img = ""; + + return $img; + }); + // ->image('',50); + $grid->cash_code_img->display(function($appletImg){ + $id = $this->id; + $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'; + $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; + $img = ""; + + return $img; + }); + // ->image('',50); $grid->sort->sortable(); $grid->is_rest->switch(); @@ -139,7 +155,7 @@ class StoreController extends AdminController $categoryList = CategoryModel::getArray([['parent_id','=',0]]); // 用户 $userList = UserModel::getUserArray(); - // 绑定了店铺的用户 + // 已绑定店铺的用户 $userHas = StoreModel::pluck('admin_id')->toArray(); foreach($userList as $ku => $uv){ @@ -173,7 +189,7 @@ class StoreController extends AdminController ->saving(function ($v) { return $v == 1 ? 1 : 0; }); - $form->text('address'); + $form->text('address')->required(); }); $form->column(6, function (Form $form) use($userList){ $form->image('business_license')->required()->uniqueName(); diff --git a/app/Models/v3/Banners.php b/app/Models/v3/Banners.php index 89524eb..bf2296d 100644 --- a/app/Models/v3/Banners.php +++ b/app/Models/v3/Banners.php @@ -64,7 +64,7 @@ class Banners extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/app/Models/v3/Category.php b/app/Models/v3/Category.php index 7e4950b..2b3c595 100644 --- a/app/Models/v3/Category.php +++ b/app/Models/v3/Category.php @@ -73,7 +73,7 @@ class Category extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/app/Models/v3/Goods.php b/app/Models/v3/Goods.php index 3fa366c..0105f41 100644 --- a/app/Models/v3/Goods.php +++ b/app/Models/v3/Goods.php @@ -62,7 +62,7 @@ class Goods extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/app/Models/v3/GoodsActivity.php b/app/Models/v3/GoodsActivity.php index 2a2aa45..7cbdd9e 100644 --- a/app/Models/v3/GoodsActivity.php +++ b/app/Models/v3/GoodsActivity.php @@ -83,7 +83,7 @@ class GoodsActivity extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/app/Models/v3/GoodsNew.php b/app/Models/v3/GoodsNew.php index c0b6dfe..69c921d 100644 --- a/app/Models/v3/GoodsNew.php +++ b/app/Models/v3/GoodsNew.php @@ -62,7 +62,7 @@ class GoodsNew extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/app/Models/v3/ServicePersonnel.php b/app/Models/v3/ServicePersonnel.php index f68195b..eb25c81 100644 --- a/app/Models/v3/ServicePersonnel.php +++ b/app/Models/v3/ServicePersonnel.php @@ -12,5 +12,60 @@ class ServicePersonnel extends Model use SoftDeletes; protected $table = 'lanzu_service_personnel'; - + protected $dateFormat = 'U'; + + /* 查询记录数 limit */ + protected $perPage = 10; + + public static $_TYPE= [1=>'普通专员',2=>'市场经理']; + public static $_STATUS = [-1=>'禁用',0=>'禁用',1=>'启用',2=>'删除']; + + protected $appends = [ + 'type_text', + 'status_text' + ]; + + public function getTypeTextAttribute($value) + { + $value = $value ? $value : $this->type; + return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : ''; + } + public function getStatusTextAttribute($value) + { + $value = $value ? $value : $this->status; + return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; + } + + /** + * 获取单条信息 + * @param int $id + * @param string $field + * @return string + */ + public static function getInfo($id,$field = '*') + { + return self::select($field)->find($id); + } + + /** + * 获取二级分类数组 + * id为键，title为值 + * @return array + */ + public static function getArray($where = [],$options = []) + { + $model = self::where('status',1) + ->whereNull('deleted_at'); + + if(count($where) > 0){ + $model->where($where); + } + $list = $model->pluck('id','name')->toArray(); + if(!empty($options)){ + $new = array_merge($options,$list); + return array_flip($new); + }else{ + return array_flip($list); + } + } } diff --git a/app/Models/v3/Store.php b/app/Models/v3/Store.php index c445f7b..0370a3b 100644 --- a/app/Models/v3/Store.php +++ b/app/Models/v3/Store.php @@ -11,7 +11,7 @@ class Store extends Model use HasDateTimeFormatter; use SoftDeletes; - protected $table = 'lanzu_store'; + protected $table = 'lanzu_store_new'; protected $dateFormat = 'U'; /* 查询记录数 limit */ @@ -107,7 +107,7 @@ class Store extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/app/Models/v3/StoreNew.php b/app/Models/v3/StoreNew.php index 7db225f..62e9fc1 100644 --- a/app/Models/v3/StoreNew.php +++ b/app/Models/v3/StoreNew.php @@ -17,8 +17,8 @@ class StoreNew extends Model /* 查询记录数 limit */ protected $perPage = 10; - public static $_isRest= ['否','是']; - public static $_isOpen = ['关闭','开启']; + public static $_ISREST= ['否','是']; + public static $_ISOPEN = ['关闭','开启']; protected $appends = [ 'logo_url', @@ -35,12 +35,12 @@ class StoreNew extends Model public function getIsRestTextAttribute($value) { $value = $value ? $value : $this->is_rest; - return isset(self::$_onRest[$value]) ? self::$_onRest[$value] : ''; + return isset(self::$_ISREST[$value]) ? self::$_ISREST[$value] : ''; } public function getIsOpenTextAttribute($value) { $value = $value ? $value : $this->is_iopen; - return isset(self::$_isOpen[$value]) ? self::$_isOpen[$value] : ''; + return isset(self::$_ISOPEN[$value]) ? self::$_ISOPEN[$value] : ''; } /** @@ -107,7 +107,7 @@ class StoreNew extends Model public function imageUrl($value) { if(strripos($value,"http") === false){ - return env('OSS_IMG_HOST').'/'.$value; + return config('filesystems.disks.oss.img_host').'/'.$value; }else{ return $value; } diff --git a/config/filesystems.php b/config/filesystems.php index e8d5d51..1f00391 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -67,10 +67,12 @@ return [ 'secret_key' => env('OSS_ACCESS_SECRET'), 'endpoint' => env('OSS_ENDPOINT'), // 使用 ssl 这里设置如: https://oss-cn-beijing.aliyuncs.com 'bucket' => env('OSS_BUCKET'), - 'isCName' => env('OSS_IS_CNAME', false), // 如果 isCname 为 false，endpoint 应配置 oss 提供的域名如：`oss-cn-beijing.aliyuncs.com`，否则为自定义域名，，cname 或 cdn 请自行到阿里 oss 后台配置并绑定 bucket + 'isCName' => env('OSS_IS_CNAME', false), + // 如果 isCname 为 false，endpoint 应配置 oss 提供的域名如：`oss-cn-beijing.aliyuncs.com`，否则为自定义域名，，cname 或 cdn 请自行到阿里 oss 后台配置并绑定 bucket // 如果有更多的 bucket 需要切换，就添加所有bucket，默认的 bucket 填写到上面，不要加到 buckets 中 'buckets'=>[ ], + 'img_host' => env('OSS_IMG_HOST'), ], 's3' => [ From 08202166088ad6f1137276ea23e8bfccbdbac9c2 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Mon, 14 Sep 2020 18:00:17 +0800 Subject: [PATCH 02/56] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0=E7=9C=81=20=E5=B8=82=20?= =?UTF-8?q?=E5=8C=BA=20=E4=B8=8B=E6=8B=89=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ImsCjdcMarketController.php | 28 ++++++++----------- app/Admin/Controllers/LanzuArea.php | 18 ++++++++++++ app/Admin/routes.php | 6 +++- app/Models/LanzuArea.php | 19 +++++++++++++ 4 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 app/Admin/Controllers/LanzuArea.php create mode 100644 app/Models/LanzuArea.php diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index 5716c23..51f9efa 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\ImsCjdcMarket; +use App\Models\LanzuArea; use App\Models\LanzuMmInfo; use App\Models\v3\Market; use Dcat\Admin\Admin; @@ -83,7 +84,7 @@ class ImsCjdcMarketController extends AdminController */ protected function detail($id) { - return Show::make($id, new ImsCjdcMarket(), function (Show $show) { + return Show::make($id, new Market(), function (Show $show) { if (!\Admin::user()->isAdministrator() && $show->model()->mp_id == 0) { $show->panel() @@ -103,23 +104,8 @@ class ImsCjdcMarketController extends AdminController $show->addtime('创建时间'); $show->sort; $show->status()->using([0=>'禁用',1=>'正常']); - $show->coordinates; $show->remark; $show->address; - $show->poundage; - $show->dn_poundage; - $show->dm_poundage; - $show->yd_poundage; - $show->loudspeaker_imei; - $show->dishes_menu_intro; - $show->create_time->as(function ($time){ - if ($time){ - return date('Y-m-d H:i',$time); - }else{ - return '-'; - } - - }); $show->created_at->as(function ($time){ if ($time){ return date('Y-m-d H:i',$time); @@ -151,6 +137,11 @@ class ImsCjdcMarketController extends AdminController $form->text('name')->required(); $form->select('mp_id', '服务商')->options('/api/getMpInfo')->required(); $form->mobile('tel','电话')->required(); + $form->select('province_id','省') + ->options('/api/area')->required() + ->load('city_id','/api/area'); + $form->select('city_id','市')->required()->load('region_id','/api/area'); + $form->select('region_id','区')->required(); $form->text('address')->required(); if ($form->isEditing()){ $form->text('coordinates') @@ -164,6 +155,7 @@ class ImsCjdcMarketController extends AdminController ->placeholder('输入 经纬度,如: 108.281552,22.83731') ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度"); } + $form->number('sort', '排序'); $form->switch('status', '状态'); $form->image('logo')->required(); @@ -178,7 +170,7 @@ class ImsCjdcMarketController extends AdminController $form->lat = $coordinates[1]; $form->deleteInput('coordinates'); }); - + $form->deleting(function (Form $form){ //删除市场前,校验该市场下是否存在市场经理 $mids = array_column($form->model()->toArray(), 'id'); @@ -206,4 +198,6 @@ class ImsCjdcMarketController extends AdminController } return response()->json($ret); } + + } diff --git a/app/Admin/Controllers/LanzuArea.php b/app/Admin/Controllers/LanzuArea.php new file mode 100644 index 0000000..a3a350c --- /dev/null +++ b/app/Admin/Controllers/LanzuArea.php @@ -0,0 +1,18 @@ +get('q')??0; + return Area::getArea($pid); + } +} diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 569279d..f313bca 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -61,7 +61,7 @@ Route::group([ // 平台管理 $router->resource('/banners', 'v3\BannersController'); $router->resource('/system_config', 'v3\SystemConfigController'); - + $router->resource('/order', 'ImsCjdcOrderMainController'); $router->resource('/order', 'ImsCjdcOrderMainController'); $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail'); @@ -72,5 +72,9 @@ Route::group([ // 服务站专员 $router->resource('/service_personnel', 'v3\ServicePersonnelController'); + + //地区 + $router->any('/api/area', 'LanzuArea@getArea'); + }); diff --git a/app/Models/LanzuArea.php b/app/Models/LanzuArea.php new file mode 100644 index 0000000..d3fea12 --- /dev/null +++ b/app/Models/LanzuArea.php @@ -0,0 +1,19 @@ +select('id','name as text')->get()->toArray(); + return $data; + } +} From df88e7b605595911c8699d16b87e8c33eacf8e62 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 14 Sep 2020 19:06:36 +0800 Subject: [PATCH 03/56] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=99=E4=B8=93?= =?UTF-8?q?=E5=91=98=E7=94=9F=E4=BA=A7=E8=AF=84=E4=BB=B7=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/StoreQRCode.php | 2 +- .../Common/{QRCode.php => WeChatQrCode.php} | 12 +++++------ .../v3/ServicePersonnelController.php | 21 +++++++++++++++---- app/Admin/Controllers/v3/StoreController.php | 4 ++-- 4 files changed, 26 insertions(+), 13 deletions(-) rename app/Admin/Common/{QRCode.php => WeChatQrCode.php} (53%) diff --git a/app/Admin/Common/StoreQRCode.php b/app/Admin/Common/StoreQRCode.php index 7f639bb..dac7c24 100644 --- a/app/Admin/Common/StoreQRCode.php +++ b/app/Admin/Common/StoreQRCode.php @@ -6,7 +6,7 @@ use Dcat\Admin\Controllers\AdminController; use EasyWeChat\Factory; use Intervention\Image\ImageManager; -class StoreQRCode extends AdminController +class StoreQrCode extends AdminController { protected $images; protected $imageManager; diff --git a/app/Admin/Common/QRCode.php b/app/Admin/Common/WeChatQrCode.php similarity index 53% rename from app/Admin/Common/QRCode.php rename to app/Admin/Common/WeChatQrCode.php index 323c17d..74dc0be 100644 --- a/app/Admin/Common/QRCode.php +++ b/app/Admin/Common/WeChatQrCode.php @@ -5,7 +5,7 @@ namespace App\Admin\Common; use Dcat\Admin\Controllers\AdminController; use EasyWeChat\Factory; -class QRCode extends AdminController +class WeChatQrCode extends AdminController { protected $images; @@ -17,15 +17,15 @@ class QRCode extends AdminController /** * 服务站专员评价小程序码 */ - public function getServicePersonnel($id, $path) + public function getServicePersonnel($id) { $param = "page=details&id={$id}"; $path = "zh_cjdianc/pages/Liar/loginindex"; - $codeStore = $this->images->createQrCode($param,$path); - $storeImgPath = 'QR_code/code_service_personnel_img/personnel_'.$id.'.jpg'; - $res = $this->images->uploadOss($codeStore,$storeImgPath); + $codeImg = $this->images->createQrCode($param,$path); + $imgPath = 'public/upload/qrcode/'.date('Y') . '/' . date('m-d') . '/' . date('His').md5(time()).'.png';/* 生成唯一文件名 */ + $res = $this->images->uploadOss($codeImg,$imgPath); if($res){ - return ['status' => true ,'path' => $storeImgPath]; + return ['status' => true ,'path' => $imgPath]; }else{ return ['status' => false ,'path' => '']; } diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 43d77e0..5ed0c54 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -10,6 +10,7 @@ use Dcat\Admin\Controllers\AdminController; use App\Models\v3\ServicePersonnel as ServicePersonnelModel; use App\Models\v3\Market as MarketModel; use App\Models\v3\User as UserModel; +use App\Admin\Common\WeChatQrCode; class ServicePersonnelController extends AdminController { @@ -81,6 +82,7 @@ class ServicePersonnelController extends AdminController protected function form() { return Form::make(new ServicePersonnel(), function (Form $form) { + $userId = $form->model()->user_id; //市场 $marketList = MarketModel::getMarketArray(); // 用户 @@ -88,7 +90,7 @@ class ServicePersonnelController extends AdminController // 已绑定的用户 $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); foreach($userList as $ku => $uv){ - if($ku != 0 && in_array($ku,$userHas)){ + if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ unset($userList[$ku]); } } @@ -103,13 +105,24 @@ class ServicePersonnelController extends AdminController $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); $form->select('market_id')->options($marketList)->required(); $form->select('user_id')->options($userList)->required(); + $statusList = ServicePersonnelModel::$_STATUS; + unset($statusList[0],$statusList[2]); + $form->radio('status')->options($statusList)->default(1); }); $form->saved(function(Form $form){ $id = $form->getKey(); - - // 生产专员二维码 - $qrCode = 0; + + if($form->isCreating && !empty($id)){ + $model = ServicePersonnelModel::find($id); + $qrCode = new WeChatQrCode(); + // 生成专员二维码 + $qrCodeImg = $qrCode->getServicePersonnel($id); + if($qrCodeImg['status']){ + $model->qr_url = $qrCodeImg['path']; + $model->save(); + } + } }); $form->disableResetButton(); $form->disableViewCheck(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 0e238ea..ccff02c 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -9,7 +9,7 @@ use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use App\Models\LanzuMmInfo as MminfoModel; use App\Models\v3\Market as MarketModel; -use App\Admin\Common\StoreQRCode; +use App\Admin\Common\StoreQrCode; use App\Models\v3\Store as StoreModel; use App\Models\v3\User as UserModel; use App\Models\v3\Category as CategoryModel; @@ -233,7 +233,7 @@ class StoreController extends AdminController } if($form->isCreating() && !empty($id)){ - $qrCode = new StoreQRCode(); + $qrCode = new StoreQrCode(); // 生成小程序码 店铺 $sRes = $qrCode->SetStoreWeChatCode($id); From 5db41137cde0e1ff0b71e62c11535c14c396043a Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 14 Sep 2020 20:02:11 +0800 Subject: [PATCH 04/56] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=99=E4=B8=93?= =?UTF-8?q?=E5=91=98=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/BannersController.php | 6 +-- .../v3/GoodsActivityController.php | 2 +- .../Controllers/v3/GoodsNewController.php | 1 + .../v3/ServicePersonnelController.php | 43 +++++++++++++------ app/Admin/Repositories/StoreUserReport.php | 2 +- app/Models/v3/Banners.php | 16 +++---- app/Models/v3/Goods.php | 8 ++-- app/Models/v3/GoodsActivity.php | 16 +++---- app/Models/v3/GoodsNew.php | 8 ++-- 9 files changed, 60 insertions(+), 42 deletions(-) diff --git a/app/Admin/Controllers/v3/BannersController.php b/app/Admin/Controllers/v3/BannersController.php index eea4f36..1acb0fb 100644 --- a/app/Admin/Controllers/v3/BannersController.php +++ b/app/Admin/Controllers/v3/BannersController.php @@ -92,7 +92,7 @@ class BannersController extends AdminController $form->select('market_id')->options($marketList)->default(0); // 多个市场 $form->multipleSelect('market_ids')->options($marketList); - $form->select('type')->options(BannersModel::$_type)->required(); + $form->select('type')->options(BannersModel::$_TYPE)->required(); $form->text('title')->required(); $form->text('sub_title'); $form->number('sort')->default(0); @@ -106,9 +106,9 @@ class BannersController extends AdminController }); $form->column(6, function (Form $form) { $form->image('cover')->required()->uniqueName(); - $form->select('cover_type')->options(BannersModel::$_coverType)->required(); + $form->select('cover_type')->options(BannersModel::$_COVER_TYPE)->required(); $form->text('path')->default(''); - $form->select('path_type')->options(BannersModel::$_pathType)->default(''); + $form->select('path_type')->options(BannersModel::$_PATH_TYPE)->default(''); }); $form->disableResetButton(); diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index b2d0296..57b9730 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -143,7 +143,7 @@ class GoodsActivityController extends AdminController $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); $form->image('cover_img')->required()->uniqueName(); - $form->select('type')->options(GoodsActivityModel::$_type)->default('flash_sale'); + $form->select('type')->options(GoodsActivityModel::$_TYPE)->default('flash_sale'); $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->help($form->model()->expire_time_text); }); $form->column(6, function (Form $form) { diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 40af02a..191e2f6 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -71,6 +71,7 @@ class GoodsNewController extends AdminController $filter->equal('category_id')->select($categoryList); $filter->equal('goods_category_id')->select($goodsCategoryList); $filter->equal('market_id')->select($marketList); + $filter->equal('on_sale')->select(GoodsModel::$_ONSALE); }); $grid->model()->orderBy('category_id', 'asc'); diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 5ed0c54..7b0683e 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -45,8 +45,9 @@ class ServicePersonnelController extends AdminController $filter->equal('type')->select(ServicePersonnelModel::$_TYPE); $filter->equal('market_id')->select($marketList); }); - // 每页10条 - $grid->paginate(10); + // 每页10条 + $grid->paginate(10); + $grid->disableDeleteButton(); }); } @@ -60,17 +61,33 @@ class ServicePersonnelController extends AdminController protected function detail($id) { return Show::make($id, new ServicePersonnel(), function (Show $show) { - $show->field('id'); - $show->field('user_id'); - $show->field('name'); - $show->field('tel'); - $show->field('market_id'); - $show->field('type'); - $show->field('status'); - $show->field('qr_url'); - $show->field('head_url'); - $show->field('created_at'); - $show->field('updated_at'); + $show->row(function (Show\Row $show) { + $show->width(6)->id; + $show->width(6)->field('name'); + $show->width(6)->field('tel'); + $show->width(6)->field('user_id')->as(function($userId){ + $item = UserModel::getUserInfo($userId,'nick_name'); + return empty($item) ? '' : '【'.$userId.'】：' . $item['nick_name']; + }); + + $show->width(6)->field('head_url')->image(); + $show->width(6)->field('qr_url')->image(); + }); + $show->row(function (Show\Row $show) { + $show->width(6)->field('market_id')->as(function($marketId){ + $item = MarketModel::getMarketInfo($marketId,'name'); + return empty($item) ? '' : $item['name']; + }); + $show->width(6)->field('type_text'); + $show->width(6)->field('status_text'); + + $show->width(6)->field('created_at')->as(function($createdAt){ + return date('Y-m-d H:i:s',$createdAt); + }); + $show->width(6)->field('updated_at')->as(function($updatedAt){ + return date('Y-m-d H:i:s',$updatedAt); + }); + }); }); } diff --git a/app/Admin/Repositories/StoreUserReport.php b/app/Admin/Repositories/StoreUserReport.php index dc78530..9131dae 100644 --- a/app/Admin/Repositories/StoreUserReport.php +++ b/app/Admin/Repositories/StoreUserReport.php @@ -2,7 +2,7 @@ namespace App\Admin\Repositories; -use App\Models\Store as Model; +use App\Models\v3\Store as Model; use Dcat\Admin\Grid\Model as GridModel; use Dcat\Admin\Repositories\EloquentRepository; use App\Models\StoreAccount as StoreAccountModel; diff --git a/app/Models/v3/Banners.php b/app/Models/v3/Banners.php index bf2296d..2bd698c 100644 --- a/app/Models/v3/Banners.php +++ b/app/Models/v3/Banners.php @@ -25,10 +25,10 @@ class Banners extends Model 'market_ids'=>'array', ]; - public static $_coverType = [1=>'图片', 2=>'视频']; - public static $_pathType = ['page'=>'page','webview'=>'webview','applet'=>'applet']; - public static $_type = [1=>'首页']; - public static $_status = ['禁用', '正常']; + public static $_COVER_TYPE = [1=>'图片', 2=>'视频']; + public static $_PATH_TYPE = ['page'=>'page','webview'=>'webview','applet'=>'applet']; + public static $_TYPE = [1=>'首页']; + public static $_STATUS = ['禁用', '正常']; public function getCoverUrlAttribute($value) { @@ -39,22 +39,22 @@ class Banners extends Model public function getCoverTypeTextAttribute($value) { $value = $value ? $value : $this->cover_type; - return isset(self::$_coverType[$value]) ? self::$_coverType[$value] : ''; + return isset(self::$_COVER_TYPE[$value]) ? self::$_COVER_TYPE[$value] : ''; } public function getPathTypeTextAttribute($value) { $value = $value ? $value : $this->path_type; - return isset(self::$_pathType[$value]) ? self::$_pathType[$value] : ''; + return isset(self::$_PATH_TYPE[$value]) ? self::$_PATH_TYPE[$value] : ''; } public function getTypeTextAttribute($value) { $value = $value ? $value : $this->type; - return isset(self::$_type[$value]) ? self::$_type[$value] : ''; + return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : ''; } public function getStatusTextAttribute($value) { $value = $value ? $value : $this->stauts; - return isset(self::$_status[$value]) ? self::$_status[$value] : ''; + return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; } /** * 处理旧图片 diff --git a/app/Models/v3/Goods.php b/app/Models/v3/Goods.php index 0105f41..f9c98be 100644 --- a/app/Models/v3/Goods.php +++ b/app/Models/v3/Goods.php @@ -27,8 +27,8 @@ class Goods extends Model 'spec'=>'array', ]; - public static $_onSale = ['否','是']; - public static $_isInfinite = ['关闭','开启']; + public static $_ONSALE = ['否','是']; + public static $_ISINFINITE = ['关闭','开启']; public function getCoverImgUrlAttribute($value) { @@ -38,12 +38,12 @@ class Goods extends Model public function getOnSaleTextAttribute($value) { $value = $value ? $value : $this->on_sale; - return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : ''; + return isset(self::$_ONSALE[$value]) ? self::$_ONSALE[$value] : ''; } public function getIsInfiniteTextAttribute($value) { $value = $value ? $value : $this->is_infinite; - return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : ''; + return isset(self::$_ISINFINITE[$value]) ? self::$_ISINFINITE[$value] : ''; } public function ImageBanners(){ return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',1); diff --git a/app/Models/v3/GoodsActivity.php b/app/Models/v3/GoodsActivity.php index 7cbdd9e..009ae4e 100644 --- a/app/Models/v3/GoodsActivity.php +++ b/app/Models/v3/GoodsActivity.php @@ -28,10 +28,10 @@ class GoodsActivity extends Model 'spec'=>'array', ]; - public static $_type = ['flash_sale'=>'秒杀','group_buy'=>'团购','new_product'=>'新品']; - public static $_onSale = ['否','是']; - public static $_isInfinite = ['关闭','开启']; - public static $_canUseCoupon = ['否','是']; + public static $_TYPE = ['flash_sale'=>'秒杀','group_buy'=>'团购','new_product'=>'新品']; + public static $_ONSALE = ['否','是']; + public static $_ISINFINITE = ['关闭','开启']; + public static $_CAN_USE_COUPON = ['否','是']; public function getCoverImgUrlAttribute($value) { @@ -41,22 +41,22 @@ class GoodsActivity extends Model public function getTypeTextAttribute($value) { $value = $value ? $value : $this->type; - return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : ''; + return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : ''; } public function getOnSaleTextAttribute($value) { $value = $value ? $value : $this->on_sale; - return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : ''; + return isset(self::$_ONSALE[$value]) ? self::$_ONSALE[$value] : ''; } public function getIsInfiniteTextAttribute($value) { $value = $value ? $value : $this->is_infinite; - return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : ''; + return isset(self::$_ISINFINITE[$value]) ? self::$_ISINFINITE[$value] : ''; } public function getCanUseCouponTextAttribute($value) { $value = $value ? $value : $this->can_use_coupon; - return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : ''; + return isset(self::$_CAN_USE_COUPON[$value]) ? self::$_CAN_USE_COUPON[$value] : ''; } public function getExpireTimeTextAttribute() { diff --git a/app/Models/v3/GoodsNew.php b/app/Models/v3/GoodsNew.php index 69c921d..0850ba2 100644 --- a/app/Models/v3/GoodsNew.php +++ b/app/Models/v3/GoodsNew.php @@ -27,8 +27,8 @@ class GoodsNew extends Model 'spec'=>'array', ]; - public static $_onSale = ['否','是']; - public static $_isInfinite = ['关闭','开启']; + public static $_ONSALE = ['否','是']; + public static $_ISINFINITE = ['关闭','开启']; public function getCoverImgUrlAttribute($value) { @@ -38,12 +38,12 @@ class GoodsNew extends Model public function getOnSaleTextAttribute($value) { $value = $value ? $value : $this->on_sale; - return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : ''; + return isset(self::$_ONSALE[$value]) ? self::$_ONSALE[$value] : ''; } public function getIsInfiniteTextAttribute($value) { $value = $value ? $value : $this->is_infinite; - return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : ''; + return isset(self::$_ISINFINITE[$value]) ? self::$_ISINFINITE[$value] : ''; } public function ImageNewBanners(){ return $this->hasMany('\App\Models\v3\GoodsNewBanners','goods_id','id')->where('type',1); From 8affbd0143c613f302b12b46bd5a7d941b06755a Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Mon, 14 Sep 2020 21:10:01 +0800 Subject: [PATCH 05/56] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ImsCjdcOrderMainController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 6e3c5ee..4c704fc 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -64,7 +64,7 @@ class ImsCjdcOrderMainController extends AdminController $state = $actions->row->state; if ($state == 2) { - $actions->append(new OrderStateHandle('接单', 3)); + $actions->append(new OrderStateHandle('
接单
', 3)); } elseif ($state == 311) { $actions->append(new OrderStateHandle('完成', 4)); $actions->append(new OrderPrint('打印')); @@ -75,13 +75,12 @@ class ImsCjdcOrderMainController extends AdminController $actions->append(new OrderStateHandle('同意退款', 9)); $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝退款')); } - $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '详情')); + $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '
详情
')); }); $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); - + $filter->equal('order_num'); }); $grid->disableViewButton(); From 41e9817517bb44581c0b273c1a9308891f824aff Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Mon, 14 Sep 2020 21:10:59 +0800 Subject: [PATCH 06/56] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=99=E4=B8=93?= =?UTF-8?q?=E5=91=98-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/ServicePersonnelController.php | 8 ++++---- app/Console/Commands/MigrateStore.php | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 7b0683e..bb23ae7 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -47,7 +47,7 @@ class ServicePersonnelController extends AdminController }); // 每页10条 $grid->paginate(10); - $grid->disableDeleteButton(); + // $grid->disableDeleteButton(); }); } @@ -116,7 +116,7 @@ class ServicePersonnelController extends AdminController $form->hidden('id'); $form->text('name')->required(); $form->text('tel')->required(); - $form->image('head_url')->required(); + $form->image('head_url'); }); $form->column(6,function(Form $form) use($marketList,$userList){ $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); @@ -129,8 +129,8 @@ class ServicePersonnelController extends AdminController $form->saved(function(Form $form){ $id = $form->getKey(); - - if($form->isCreating && !empty($id)){ + + if($form->isCreating() && !empty($id)){ $model = ServicePersonnelModel::find($id); $qrCode = new WeChatQrCode(); // 生成专员二维码 diff --git a/app/Console/Commands/MigrateStore.php b/app/Console/Commands/MigrateStore.php index 67fd1e1..6d4d42f 100644 --- a/app/Console/Commands/MigrateStore.php +++ b/app/Console/Commands/MigrateStore.php @@ -41,8 +41,8 @@ class MigrateStore extends Command { $oldTableName = 'ims_cjdc_store_new'; $newTableName = 'lanzu_store_new'; - $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */ - $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */ + // $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */ + // $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */ // 判断表是否存在 if(!Schema::hasTable($oldTableName)){ var_dump('旧表不存在'); @@ -106,10 +106,10 @@ class MigrateStore extends Command 'introduction'=> strip_tags($value->details), - 'store_applet_img' => $storeImgPath.$storeId.'.jpg', - 'cash_code_img' => $storePayPath.$storeId.'.jpg', + 'store_applet_img' => '', + 'cash_code_img' => '', - 'created_at' => strtotime($value->sq_time), + 'created_at' => $value->time_add ?strtotime($value->time_add) : 0, 'updated_at' => time(), ]; From 947a9f9099813a7d4ef2d9bb3f6d653637cf70f2 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 08:58:57 +0800 Subject: [PATCH 07/56] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ImsCjdcOrderMainController.php | 12 ++++++------ app/Admin/Extensions/CheckRow.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 4c704fc..7d4d10d 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -66,14 +66,14 @@ class ImsCjdcOrderMainController extends AdminController if ($state == 2) { $actions->append(new OrderStateHandle('
接单
', 3)); } elseif ($state == 311) { - $actions->append(new OrderStateHandle('完成', 4)); - $actions->append(new OrderPrint('打印')); + $actions->append(new OrderStateHandle('
完成
', 4)); + $actions->append(new OrderPrint('
打印
')); } elseif ($state == 3) { - $actions->append(new OrderPrint('打印')); - $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送')); + $actions->append(new OrderPrint('
打印
')); + $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '
自送
')); } elseif ($state == 8) { - $actions->append(new OrderStateHandle('同意退款', 9)); - $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝退款')); + $actions->append(new OrderStateHandle('
同意退款
', 9)); + $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '
拒绝退款
')); } $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '
详情
')); }); diff --git a/app/Admin/Extensions/CheckRow.php b/app/Admin/Extensions/CheckRow.php index 5d5ca48..45485c7 100644 --- a/app/Admin/Extensions/CheckRow.php +++ b/app/Admin/Extensions/CheckRow.php @@ -30,7 +30,7 @@ class CheckRow extends RowAction $form = SelectHorseman::make(['order_id'=>$this->order_id,'current_page'=>$this->currentPage]); return Modal::make() ->lg() - ->title($this->title) + ->title('选择配送员') ->body($form) ->button($this->title); From 3752e7b07d02ea5ea5ecb4b46b8eb5cf91882af3 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 09:18:24 +0800 Subject: [PATCH 08/56] =?UTF-8?q?=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ImsCjdcOrderMainController.php | 4 ---- app/Admin/Extensions/CheckRow.php | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 7d4d10d..d783935 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -11,10 +11,6 @@ use App\Admin\Extensions\OrderPrint; use App\Admin\Extensions\OrderRefund; use App\Admin\Extensions\OrderStateHandle; use App\Admin\Repositories\ImsCjdcOrderMain; -use App\Models\ImsCjdcMarket; -use App\Models\LanzuMarket; -use App\Models\LanzuMpInfo; -use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Layout\Content; diff --git a/app/Admin/Extensions/CheckRow.php b/app/Admin/Extensions/CheckRow.php index 45485c7..a84e187 100644 --- a/app/Admin/Extensions/CheckRow.php +++ b/app/Admin/Extensions/CheckRow.php @@ -1,13 +1,11 @@ Date: Tue, 15 Sep 2020 10:06:55 +0800 Subject: [PATCH 09/56] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=87=92=E6=97=8F?= =?UTF-8?q?=E5=91=98=E5=B7=A5-=E5=88=9D=E5=A7=8B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=88=90=E5=8A=9F=E5=90=8E=E4=B8=8D=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=20=E5=BA=97=E9=93=BA=E6=90=9C=E7=B4=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Actions/Grid/{ => v3}/GoodsCopy.php | 4 +- .../Controllers/v3/CategoryController.php | 2 +- app/Admin/Controllers/v3/GoodsController.php | 4 +- .../v3/LanzuEmployeesController.php | 92 +++++++++++++++++++ app/Admin/Controllers/v3/StoreController.php | 14 ++- app/Admin/Forms/GoodsNewCopyForm.php | 4 +- app/Admin/Forms/{ => v3}/CategoryTieForm.php | 2 +- app/Admin/Forms/{ => v3}/GoodsCopyForm.php | 2 +- app/Admin/Repositories/v3/LanzuEmployees.php | 16 ++++ app/Admin/routes.php | 8 +- app/Models/v3/LanzuEmployees.php | 70 ++++++++++++++ resources/lang/zh-CN/lanzu-employees.php | 18 ++++ 12 files changed, 221 insertions(+), 15 deletions(-) rename app/Admin/Actions/Grid/{ => v3}/GoodsCopy.php (87%) create mode 100644 app/Admin/Controllers/v3/LanzuEmployeesController.php rename app/Admin/Forms/{ => v3}/CategoryTieForm.php (98%) rename app/Admin/Forms/{ => v3}/GoodsCopyForm.php (99%) create mode 100644 app/Admin/Repositories/v3/LanzuEmployees.php create mode 100644 app/Models/v3/LanzuEmployees.php create mode 100644 resources/lang/zh-CN/lanzu-employees.php diff --git a/app/Admin/Actions/Grid/GoodsCopy.php b/app/Admin/Actions/Grid/v3/GoodsCopy.php similarity index 87% rename from app/Admin/Actions/Grid/GoodsCopy.php rename to app/Admin/Actions/Grid/v3/GoodsCopy.php index 00be8b5..21234ed 100644 --- a/app/Admin/Actions/Grid/GoodsCopy.php +++ b/app/Admin/Actions/Grid/v3/GoodsCopy.php @@ -1,10 +1,10 @@ column('id')->sortable(); + $grid->column('market_id'); + $grid->column('user_id')->display(function($userId){ + $item = UserModel::getUserInfo($userId,'real_name'); + return empty($item) ? '' : $$item['real_name']; + }); + $grid->column('store_id')->display(function($storeId){ + $item = StoreModel::getStoreInfo($storeId,'real_name'); + return empty($item) ? '' : $$item['real_name']; + }); + + $grid->column('role')->display(function($role){ + return $role; + }); + $grid->column('status')->select(EmployeesModel::$_STATUS); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id'); + + }); + $grid->model()->orderBy('id','desc'); + // 每页10条 + $grid->paginate(10); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new LanzuEmployees(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('store_id'); + $show->field('market_id'); + $show->field('role'); + $show->field('status'); + $show->field('note'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new LanzuEmployees(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('store_id'); + $form->text('market_id'); + $form->text('role'); + $form->text('status'); + $form->text('note'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index ccff02c..95e9c26 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -27,14 +27,19 @@ class StoreController extends AdminController protected function grid() { return Grid::make(new Store(), function (Grid $grid) { + // 查询市场 + $marketList = MarketModel::getMarketArray(); + // 查询一级分类 + // $categoryList = CategoryModel::getArray([['parent_id','=',0]]); + $grid->model()->orderBy('id','desc'); $grid->id->sortable(); $grid->logo_url->image('',50); $grid->name; - $grid->market_id->display(function ($marketId){ - $market = MarketModel::getMarketInfo($marketId,'name'); - return empty($market) ? '' : $market->name; + $grid->market_id->display(function ($marketId) use($marketList){ + // $market = MarketModel::getMarketInfo($marketId,'name'); + return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; }); $grid->mm_user_id->display(function ($mmUserId){ $mmUser = MminfoModel::getMmInfo($mmUserId,'name'); @@ -65,9 +70,10 @@ class StoreController extends AdminController $grid->actions([new StoreSetTime()]); // 搜索 - $grid->filter(function (Grid\Filter $filter) { + $grid->filter(function (Grid\Filter $filter) use($marketList){ $filter->equal('id'); $filter->like('name'); + $filter->equal('market_id')->select($marketList); }); // 每页10条 diff --git a/app/Admin/Forms/GoodsNewCopyForm.php b/app/Admin/Forms/GoodsNewCopyForm.php index 8ca431c..6fda924 100644 --- a/app/Admin/Forms/GoodsNewCopyForm.php +++ b/app/Admin/Forms/GoodsNewCopyForm.php @@ -73,10 +73,12 @@ class GoodsNewCopyForm extends Form ]; GoodsBannerModel::insert($banners); } + }else{ + return $this->error('修改失败'); }; } - return $this->success('修改成功', '/goods'); + return $this->error('修改成功'); } /** diff --git a/app/Admin/Forms/CategoryTieForm.php b/app/Admin/Forms/v3/CategoryTieForm.php similarity index 98% rename from app/Admin/Forms/CategoryTieForm.php rename to app/Admin/Forms/v3/CategoryTieForm.php index 9db8732..535c308 100644 --- a/app/Admin/Forms/CategoryTieForm.php +++ b/app/Admin/Forms/v3/CategoryTieForm.php @@ -1,6 +1,6 @@ resource('/order', 'ImsCjdcOrderMainController'); $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail'); - $router->resource('/horseman', 'LanzuServiceHorsemanController'); $router->any('ops/files', 'v3\FileController@handle'); - // 服务站专员 + // 服务人员 $router->resource('/service_personnel', 'v3\ServicePersonnelController'); + $router->resource('/horseman', 'LanzuServiceHorsemanController'); + + // 懒族员工 + $router->resource('/employees', 'v3\LanzuEmployeesController'); + }); diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php new file mode 100644 index 0000000..6736577 --- /dev/null +++ b/app/Models/v3/LanzuEmployees.php @@ -0,0 +1,70 @@ +'离职',0=>'禁用',1=>'正常']; + + protected $appends = [ + 'is_rest_text', + 'is_open_text' + ]; + + public function getTypeTextAttribute($value) + { + $value = $value ? $value : $this->type; + return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : ''; + } + public function getIsRestTextAttribute($value) + { + $value = $value ? $value : $this->status; + return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; + } + + /** + * 根据id获取单条信息 + * @param int $id + * @param string $field + * @return string + */ + public static function getInfo($id,$field = '*') + { + return self::select($field)->find($id); + } + + /** + * 获取数组 + * id为键 + * @return array + */ + public static function getArray($where = [], $options = []) + { + $model = self::whereNull('deleted_at'); + + if(!empty($where)){ + $model->where($where); + } + $list = $model->pluck('id','user_id')->toArray(); + if(!empty($options)){ + $new = array_merge($options,$list); + return array_flip($new); + }else{ + return array_flip($list); + } + } +} diff --git a/resources/lang/zh-CN/lanzu-employees.php b/resources/lang/zh-CN/lanzu-employees.php new file mode 100644 index 0000000..257958e --- /dev/null +++ b/resources/lang/zh-CN/lanzu-employees.php @@ -0,0 +1,18 @@ + [ + 'LanzuEmployees' => '懒族员工', + 'lanzuEmployees' => '懒族员工', + 'lanzu_employees' => '懒族员工', + ], + 'fields' => [ + 'user_id' => '用户懒ID', + 'store_id' => '店铺', + 'market_id' => '服务站ID', + 'role' => '用户角色', + 'status' => '状态', + 'note' => '备注', + ], + 'options' => [ + ], +]; From 6a08e728203fe21415798f9c3bfb10008bbc8aee Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 10:57:50 +0800 Subject: [PATCH 10/56] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8D=A1=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/HomeController.php | 18 ++++++++++--- .../Metrics/Examples/Community/TotalUser.php | 2 +- .../Metrics/Examples/Order/OrderData.php | 25 +++++++++++++------ .../Metrics/Examples/ServiceCard/TotalMp.php | 2 +- .../Examples/ServiceCard/TotalStore.php | 2 +- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index 6408127..a19428b 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -4,6 +4,8 @@ namespace App\Admin\Controllers; use App\Admin\Metrics\Examples; use App\Http\Controllers\Controller; +use App\Models\LanzuMpInfo; +use App\Models\v3\Market; use Dcat\Admin\Controllers\Dashboard; use Dcat\Admin\Layout\Column; use Dcat\Admin\Layout\Content; @@ -56,15 +58,23 @@ class HomeController extends Controller protected function lanzu_mp(Content $content) { + $mp = LanzuMpInfo::where('admin_user_id',Admin::user()->id)->first(); + $marketIds = Market::where('mp_id',$mp->id)->pluck('id')->toArray(); return $content->header('控制面板') ->description('欢迎回到懒族后台') - ->body(function (Row $row) { - $row->column(4, function (Column $column) { + ->body(function (Row $row) use ($marketIds) { + $row->column(3, function (Column $column) { $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MP)); }); - $row->column(4, function (Column $column) { - $column->row(new Examples\ServiceCard\TotalMm()); + $row->column(3, function (Column $column) { + $column->row(new Examples\ServiceCard\TotalStore()); + }); + $row->column(3, function (Column $column)use ($marketIds) { + $column->row(new Examples\Order\OrderData('number',$marketIds,'订单数')); + }); + $row->column(3, function (Column $column)use ($marketIds) { + $column->row(new Examples\Order\OrderData('amount',$marketIds,'订单金额')); }); }); } diff --git a/app/Admin/Metrics/Examples/Community/TotalUser.php b/app/Admin/Metrics/Examples/Community/TotalUser.php index d863bc9..4aea10f 100644 --- a/app/Admin/Metrics/Examples/Community/TotalUser.php +++ b/app/Admin/Metrics/Examples/Community/TotalUser.php @@ -13,7 +13,7 @@ class TotalUser extends Card protected function init() { parent::init(); - $this->title = '绑定用户数'; + $this->title = '社区绑定用户数'; $adu = Admin::user(); if ($adu->isRole('lanzu_cs')){ $this->content(LanzuUserRelationBind::getCount($adu->id)); diff --git a/app/Admin/Metrics/Examples/Order/OrderData.php b/app/Admin/Metrics/Examples/Order/OrderData.php index f6a8c4b..974ef81 100644 --- a/app/Admin/Metrics/Examples/Order/OrderData.php +++ b/app/Admin/Metrics/Examples/Order/OrderData.php @@ -7,15 +7,18 @@ use App\Models\ImsCjdcOrder; use App\Models\ImsCjdcOrderMain; use Dcat\Admin\Widgets\Metrics\Card; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class OrderData extends Card { protected $title; protected $data_type; - public function __construct($data_type=null,$title = null, $icon = null) + protected $market_id; + public function __construct($data_type=null,$market_id=null,$title = null, $icon = null) { $this->title = $title; $this->data_type = $data_type; + $this->market_id = $market_id; parent::__construct($title, $icon); } @@ -36,16 +39,21 @@ class OrderData extends Card { $type = $request->get('option');//数据选项 $data_type = $request->get('data_type');//数据类型 - $this->content($this->orderNum($data_type,$type)); + $market_id = $request->get('market_id');//市场id + $this->content($this->orderNum($data_type,$type,$market_id)); } - public function orderDataBuild($marketId=null,$type=null) + public function orderDataBuild($type=null,$marketId=null) { - $where = []; $where['type'] = 1; if ($marketId){ - $where['market_id'] = $marketId; + if (is_array($marketId)){ + $where[] = ['in'=>['market_id'=>$marketId]]; + }else{ + $where['market_id'] = $marketId; + } + } switch ($type){ @@ -82,9 +90,9 @@ class OrderData extends Card } - public function orderNum($data_type,$type) + public function orderNum($data_type,$type,$marketId) { - $build = $this->orderDataBuild($marketId=null,$type); + $build = $this->orderDataBuild($type,$marketId); if ($data_type=='number'){ $result = $build->count(); }elseif ($data_type=='amount'){ @@ -100,7 +108,8 @@ class OrderData extends Card public function parameters() : array { return [ - 'data_type'=>$this->data_type + 'data_type'=>$this->data_type, + 'market_id'=>$this->market_id, ]; } diff --git a/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php b/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php index c8b2638..075aa13 100644 --- a/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php +++ b/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php @@ -12,7 +12,7 @@ class TotalMp extends Card protected function init() { parent::init(); - $this->title = '服务商量数'; + $this->title = '服务商总数'; $this->content(LanzuMpInfo::count()); } diff --git a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php index a5300c7..09f7225 100644 --- a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php +++ b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php @@ -25,7 +25,7 @@ class TotalStore extends Card $count = ImsCjdcStore::where('mm_user_id',$mm->user_id)->count(); } }elseif($aud->isRole('lanzu_mp')){ - $count = 0; + $count = ImsCjdcStore::count(); }else{ $count = ImsCjdcStore::count(); } From 8748d713168f8203c385d734dbf35ac4bbd89cae Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 11:36:19 +0800 Subject: [PATCH 11/56] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 24f66a3..3ad03e9 100644 --- a/composer.lock +++ b/composer.lock @@ -423,16 +423,16 @@ }, { "name": "dcat/laravel-admin", - "version": "1.7.3", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/jqhph/dcat-admin.git", - "reference": "d3bb2fb7162f400d97c5c9f6baf0815b91f7117b" + "reference": "397f20b719009819d79e1fca5bc0186e468ef56b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/d3bb2fb7162f400d97c5c9f6baf0815b91f7117b", - "reference": "d3bb2fb7162f400d97c5c9f6baf0815b91f7117b", + "url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/397f20b719009819d79e1fca5bc0186e468ef56b", + "reference": "397f20b719009819d79e1fca5bc0186e468ef56b", "shasum": "", "mirrors": [ { @@ -491,7 +491,7 @@ "laravel", "laravel admin" ], - "time": "2020-09-09T13:40:01+00:00" + "time": "2020-09-12T01:06:54+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -622,16 +622,16 @@ }, { "name": "doctrine/dbal", - "version": "2.10.3", + "version": "2.10.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf" + "reference": "47433196b6390d14409a33885ee42b6208160643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/03ca23afc2ee062f5d3e32426ad37c34a4770dcf", - "reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643", + "reference": "47433196b6390d14409a33885ee42b6208160643", "shasum": "", "mirrors": [ { @@ -719,7 +719,7 @@ "sqlserver", "sqlsrv" ], - "time": "2020-09-02T01:35:42+00:00" + "time": "2020-09-12T21:20:41+00:00" }, { "name": "doctrine/event-manager", @@ -2209,16 +2209,16 @@ }, { "name": "league/commonmark", - "version": "1.5.4", + "version": "1.5.5", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "21819c989e69bab07e933866ad30c7e3f32984ba" + "reference": "45832dfed6007b984c0d40addfac48d403dc6432" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba", - "reference": "21819c989e69bab07e933866ad30c7e3f32984ba", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/45832dfed6007b984c0d40addfac48d403dc6432", + "reference": "45832dfed6007b984c0d40addfac48d403dc6432", "shasum": "", "mirrors": [ { @@ -2236,7 +2236,7 @@ }, "require-dev": { "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.29.1", + "commonmark/commonmark.js": "0.29.2", "erusev/parsedown": "~1.0", "ext-json": "*", "github/gfm": "0.29.0", @@ -2280,7 +2280,7 @@ "md", "parser" ], - "time": "2020-08-18T01:19:12+00:00" + "time": "2020-09-13T14:44:46+00:00" }, { "name": "league/flysystem", @@ -2906,16 +2906,16 @@ }, { "name": "overtrue/laravel-wechat", - "version": "5.0.8", + "version": "5.0.9", "source": { "type": "git", "url": "https://github.com/overtrue/laravel-wechat.git", - "reference": "88480ba5997711d2dbf345e1f8dd7d237391aacd" + "reference": "62d5677f70ecd021ce37a7d5155d7d9fb8f303b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/laravel-wechat/zipball/88480ba5997711d2dbf345e1f8dd7d237391aacd", - "reference": "88480ba5997711d2dbf345e1f8dd7d237391aacd", + "url": "https://api.github.com/repos/overtrue/laravel-wechat/zipball/62d5677f70ecd021ce37a7d5155d7d9fb8f303b7", + "reference": "62d5677f70ecd021ce37a7d5155d7d9fb8f303b7", "shasum": "", "mirrors": [ { @@ -2926,7 +2926,7 @@ }, "require": { "illuminate/container": "^5.1 || ^6.0 || ^7.0 || ^8.0", - "overtrue/wechat": "^4.0" + "overtrue/wechat": "^4.0 || ^5.0" }, "type": "library", "extra": { @@ -2961,20 +2961,20 @@ "wechat", "weixin" ], - "time": "2020-09-11T01:15:30+00:00" + "time": "2020-09-13T05:23:10+00:00" }, { "name": "overtrue/socialite", - "version": "2.0.16", + "version": "2.0.18", "source": { "type": "git", "url": "https://github.com/overtrue/socialite.git", - "reference": "bbcd8ffd2e1f3aa7c4d5298c56c6d73803aa3067" + "reference": "d8c3ed6281939e7d2dc4da460b484886f686f8a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/socialite/zipball/bbcd8ffd2e1f3aa7c4d5298c56c6d73803aa3067", - "reference": "bbcd8ffd2e1f3aa7c4d5298c56c6d73803aa3067", + "url": "https://api.github.com/repos/overtrue/socialite/zipball/d8c3ed6281939e7d2dc4da460b484886f686f8a5", + "reference": "d8c3ed6281939e7d2dc4da460b484886f686f8a5", "shasum": "", "mirrors": [ { @@ -2985,8 +2985,8 @@ }, "require": { "ext-json": "*", - "guzzlehttp/guzzle": "~5.0|~6.0", - "php": ">=7.0", + "guzzlehttp/guzzle": "^5.0|^6.0|^7.0", + "php": ">=5.6", "symfony/http-foundation": "^2.7|^3.0|^4.0|^5.0" }, "conflict": { @@ -3021,7 +3021,7 @@ "wechat", "weibo" ], - "time": "2020-03-04T15:22:25+00:00" + "time": "2020-09-14T08:34:23+00:00" }, { "name": "overtrue/wechat", From 1fb4eab05f38b8561d0e99c65f981b0efb9afacf Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 12:11:23 +0800 Subject: [PATCH 12/56] =?UTF-8?q?=E6=87=92=E6=97=8F=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E8=A1=A8=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/LanzuEmployeesController.php | 95 +++++++++++---- app/Admin/Controllers/v3/UserController.php | 110 ++++++++++++++++++ app/Admin/Repositories/v3/User.php | 16 +++ app/Admin/routes.php | 1 + app/Models/v3/LanzuEmployees.php | 10 +- app/Models/v3/User.php | 19 +++ config/role.php | 42 +++++++ resources/lang/zh-CN/lanzu-employees.php | 4 +- resources/lang/zh-CN/user.php | 25 ++++ 9 files changed, 294 insertions(+), 28 deletions(-) create mode 100644 app/Admin/Controllers/v3/UserController.php create mode 100644 app/Admin/Repositories/v3/User.php create mode 100644 config/role.php create mode 100644 resources/lang/zh-CN/user.php diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index 7332ff6..16a5475 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -10,6 +10,8 @@ use Dcat\Admin\Controllers\AdminController; use App\Models\v3\LanzuEmployees as EmployeesModel; use App\Models\v3\User as UserModel; use App\Models\v3\Store as StoreModel; +use App\Models\v3\ServicePersonnel as ServicePersonnelModel; +use App\Models\v3\Market as MarketModel; class LanzuEmployeesController extends AdminController { @@ -21,26 +23,39 @@ class LanzuEmployeesController extends AdminController protected function grid() { return Grid::make(new LanzuEmployees(), function (Grid $grid) { + //市场 + $marketList = MarketModel::getMarketArray(); + $roleList = config('role.position'); + $grid->column('id')->sortable(); - $grid->column('market_id'); + $grid->column('market_id')->display(function($marketId) use($marketList){ + return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; + }); $grid->column('user_id')->display(function($userId){ $item = UserModel::getUserInfo($userId,'real_name'); - return empty($item) ? '' : $$item['real_name']; + return empty($item) ? '' : $item->real_name; }); $grid->column('store_id')->display(function($storeId){ - $item = StoreModel::getStoreInfo($storeId,'real_name'); - return empty($item) ? '' : $$item['real_name']; + $item = StoreModel::getStoreInfo($storeId,'name'); + return empty($item) ? '' : $item->name; }); - $grid->column('role')->display(function($role){ - return $role; + $grid->column('role')->display(function($role) use($roleList){ + $item = ''; + if(!empty($role) && is_array($role)){ + foreach($role as $key => $value){ + $item .= '【'.$roleList[$value].'】'; + } + } + return $item; }); - $grid->column('status')->select(EmployeesModel::$_STATUS); + $grid->column('status')->width(3)->select(EmployeesModel::$_STATUS); - $grid->filter(function (Grid\Filter $filter) { + $grid->filter(function (Grid\Filter $filter) use($marketList){ $filter->equal('id'); - + $filter->equal('market_id')->select($marketList); }); + $grid->model()->orderBy('status','desc'); $grid->model()->orderBy('id','desc'); // 每页10条 $grid->paginate(10); @@ -58,11 +73,29 @@ class LanzuEmployeesController extends AdminController { return Show::make($id, new LanzuEmployees(), function (Show $show) { $show->field('id'); - $show->field('user_id'); - $show->field('store_id'); - $show->field('market_id'); - $show->field('role'); - $show->field('status'); + $show->field('user_id')->as(function($userId){ + $item = UserModel::getUserInfo($userId,'real_name'); + return empty($item) ? '' : $item->real_name; + }); + $show->field('store_id')->as(function($storeId){ + $item = StoreModel::getStoreInfo($storeId,'name'); + return empty($item) ? '' : $item->name; + }); + $show->field('market_id')->as(function($marketId){ + $item = MarketModel::getMarketInfo($marketId,'name'); + return empty($item) ? '' : $item->name; + }); + $show->field('role')->as(function($role){ + $roleList = config('role.position'); + $item = ''; + if(!empty($role) && is_array($role)){ + foreach($role as $key => $value){ + $item .= ' 【'.$roleList[$value].'】'; + } + } + return $item; + }); + $show->field('status_text'); $show->field('note'); $show->field('created_at'); $show->field('updated_at'); @@ -77,16 +110,32 @@ class LanzuEmployeesController extends AdminController protected function form() { return Form::make(new LanzuEmployees(), function (Form $form) { - $form->display('id'); - $form->text('user_id'); - $form->text('store_id'); - $form->text('market_id'); - $form->text('role'); - $form->text('status'); - $form->text('note'); + $userId = $form->model()->user_id; + //市场 + $marketList = MarketModel::getMarketArray(); + //店铺 + $storeList = StoreModel::getStoreArray(); + // 用户 + $userList = UserModel::getUserArray(); + // 已绑定的用户 + $userHas = EmployeesModel::pluck('user_id')->toArray(); + foreach($userList as $ku => $uv){ + if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ + unset($userList[$ku]); + } + } + $form->hidden('id'); + $form->select('user_id')->required()->options($userList); + $form->select('market_id')->required()->options($marketList); + $form->multipleSelect('role')->required()->options(config('role.position')); + $form->select('store_id')->options($storeList); + $form->text('note')->maxLength(200); - $form->display('created_at'); - $form->display('updated_at'); + $form->hidden('status')->default(1); + $form->disableResetButton(); + $form->disableViewCheck(); + $form->disableEditingCheck(); + $form->disableCreatingCheck(); }); } } diff --git a/app/Admin/Controllers/v3/UserController.php b/app/Admin/Controllers/v3/UserController.php new file mode 100644 index 0000000..957ae19 --- /dev/null +++ b/app/Admin/Controllers/v3/UserController.php @@ -0,0 +1,110 @@ +column('id')->sortable(); + $grid->column('avatar')->image('',50); + $grid->column('nick_name'); + $grid->column('openid'); + $grid->column('unionid'); + $grid->column('real_name')->editable(); + $grid->column('tel'); + $grid->column('gender_text'); + $grid->column('status')->using(UserModel::$_STATUS)->label(config('label.status_label')); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id'); + $filter->like('nick_name'); + $filter->like('real_name'); + }); + $grid->model()->orderBy('id','desc'); + // 每页10条 + $grid->paginate(10); + $grid->disableCreateButton(); + $grid->disableDeleteButton(); + $grid->disableEditButton(); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new User(), function (Show $show) { + $show->field('id'); + $show->field('nick_name'); + $show->field('avatar')->image(); + $show->field('openid'); + $show->field('real_name'); + $show->field('tel'); + $show->field('unionid'); + $show->field('status'); + $show->field('country'); + $show->field('province'); + $show->field('city'); + $show->field('gender'); + $show->field('language'); + $show->field('created_at'); + $show->field('updated_at'); + + $show->panel()->tools(function ($tools) { + $tools->disableEdit(); + // $tools->disableList(); + $tools->disableDelete(); + // 显示快捷编辑按钮 + // $tools->showQuickEdit(); + }); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new User(), function (Form $form) { + $form->hidden('id'); + $form->text('nick_name'); + $form->image('avatar'); + $form->text('openid'); + $form->text('real_name'); + $form->tel('tel'); + $form->text('unionid'); + $form->text('status'); + $form->text('country'); + $form->text('province'); + $form->text('city'); + $form->radio('gender')->options(UserModel::$_GENDER); + $form->text('language'); + + $form->disableResetButton(); + $form->disableViewCheck(); + $form->disableEditingCheck(); + $form->disableCreatingCheck(); + }); + } +} diff --git a/app/Admin/Repositories/v3/User.php b/app/Admin/Repositories/v3/User.php new file mode 100644 index 0000000..a5a1297 --- /dev/null +++ b/app/Admin/Repositories/v3/User.php @@ -0,0 +1,16 @@ +resource('/employees', 'v3\LanzuEmployeesController'); + $router->resource('/user', 'v3\UserController'); }); diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php index 6736577..d213617 100644 --- a/app/Models/v3/LanzuEmployees.php +++ b/app/Models/v3/LanzuEmployees.php @@ -16,13 +16,15 @@ class LanzuEmployees extends Model /* 查询记录数 limit */ protected $perPage = 10; - + protected $casts = [ + 'role'=>'array', + ]; public static $_TYPE= ['']; public static $_STATUS = [-1=>'离职',0=>'禁用',1=>'正常']; protected $appends = [ - 'is_rest_text', - 'is_open_text' + 'type_text', + 'status_text' ]; public function getTypeTextAttribute($value) @@ -30,7 +32,7 @@ class LanzuEmployees extends Model $value = $value ? $value : $this->type; return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : ''; } - public function getIsRestTextAttribute($value) + public function getStatusTextAttribute($value) { $value = $value ? $value : $this->status; return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; diff --git a/app/Models/v3/User.php b/app/Models/v3/User.php index f0b9fbc..7a1feac 100644 --- a/app/Models/v3/User.php +++ b/app/Models/v3/User.php @@ -9,6 +9,25 @@ class User extends Model protected $table = 'lanzu_user'; protected $dateFormat = 'U'; + public static $_GENDER = ['保密','男','女']; + public static $_STATUS = [0=>'禁用',1=>'正常']; + + protected $appends = [ + 'gender_text', + 'status_text' + ]; + + public function getGenderTextAttribute($value) + { + $value = $value ? $value : $this->gender; + return isset(self::$_GENDER[$value]) ? self::$_GENDER[$value] : ''; + } + public function getStatusTextAttribute($value) + { + $value = $value ? $value : $this->status; + return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; + } + /** * 获取单个用户信息 * @param int $id diff --git a/config/role.php b/config/role.php new file mode 100644 index 0000000..69ac526 --- /dev/null +++ b/config/role.php @@ -0,0 +1,42 @@ +[ + 1 => '董事长', + 2 => '总经理', + 3 => '人力资源总监', + 4 => 'CTO', + 5 => '财务经理', + 6 => '运营总监', + 7 => '招商总监', + 8 => 'PHP研发主管', + 9 => '迁江智慧商城主管', + 10 => '拓展部主管', + + 11 => '拓展部副主管', + 12 => '拓展部经理', + 13 => '运维部经理', + 14 => '产品主管', + 15 => '策划经理', + 16 => '运维部副经理', + 17 => '新媒体运营', + 18 => '平面设计师', + 19 => 'UI设计师', + 20 => '前端开发工程师', + + 21 => 'PHP研发工程师', + 22 => '测试工程师', + 23 => '招商经理', + 24 => '服务站管理员', + 25 => '运维专员', + 26 => '拓展经理', + 27 => '行政助理', + 28 => '出纳', + + 29 => '骑手', + 30 => '服务专员', + + ] +]; diff --git a/resources/lang/zh-CN/lanzu-employees.php b/resources/lang/zh-CN/lanzu-employees.php index 257958e..10a010e 100644 --- a/resources/lang/zh-CN/lanzu-employees.php +++ b/resources/lang/zh-CN/lanzu-employees.php @@ -4,13 +4,15 @@ return [ 'LanzuEmployees' => '懒族员工', 'lanzuEmployees' => '懒族员工', 'lanzu_employees' => '懒族员工', + 'employees' => '懒族员工', ], 'fields' => [ 'user_id' => '用户懒ID', 'store_id' => '店铺', - 'market_id' => '服务站ID', + 'market_id' => '服务站', 'role' => '用户角色', 'status' => '状态', + 'status_text' => '状态', 'note' => '备注', ], 'options' => [ diff --git a/resources/lang/zh-CN/user.php b/resources/lang/zh-CN/user.php new file mode 100644 index 0000000..54561b9 --- /dev/null +++ b/resources/lang/zh-CN/user.php @@ -0,0 +1,25 @@ + [ + 'User' => '微信用户', + 'user' => '微信用户', + ], + 'fields' => [ + 'nick_name' => '昵称', + 'avatar' => '微信头像', + 'openid' => '微信小程序openid', + 'real_name' => '真实姓名', + 'tel' => '电话号码', + 'unionid' => '微信小程序unionid', + 'status' => '状态', + 'status_text' => '状态', + 'country' => '国家', + 'province' => '省份', + 'city' => '城市', + 'gender' => '性别', + 'gender_text' => '性别', + 'language' => '语言', + ], + 'options' => [ + ], +]; From eba2bd5fe1c5775e184dd849e6f579b714835a4f Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 14:16:42 +0800 Subject: [PATCH 13/56] =?UTF-8?q?=E6=87=92=E6=97=8F=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/LanzuEmployeesController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index 16a5475..8fc6a5f 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -51,9 +51,10 @@ class LanzuEmployeesController extends AdminController }); $grid->column('status')->width(3)->select(EmployeesModel::$_STATUS); - $grid->filter(function (Grid\Filter $filter) use($marketList){ + $grid->filter(function (Grid\Filter $filter) use($marketList,$roleList){ $filter->equal('id'); $filter->equal('market_id')->select($marketList); + $filter->equal('role')->select($roleList); }); $grid->model()->orderBy('status','desc'); $grid->model()->orderBy('id','desc'); From 4fac0f0d7ad4eece45a9792d3484f1c32cf575e1 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 15:27:38 +0800 Subject: [PATCH 14/56] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=91=98=E5=B7=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/LanzuEmployeesController.php | 56 +++++++++++-------- app/Admin/Controllers/v3/StoreController.php | 36 ++++++++---- app/Models/v3/LanzuEmployees.php | 2 +- app/Models/v3/Store.php | 12 ++-- config/role.php | 2 +- resources/lang/zh-CN/lanzu-employees.php | 2 +- 6 files changed, 70 insertions(+), 40 deletions(-) diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index 8fc6a5f..e8e2b6e 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -25,7 +25,7 @@ class LanzuEmployeesController extends AdminController return Grid::make(new LanzuEmployees(), function (Grid $grid) { //市场 $marketList = MarketModel::getMarketArray(); - $roleList = config('role.position'); + $positionList = config('role.position'); $grid->column('id')->sortable(); $grid->column('market_id')->display(function($marketId) use($marketList){ @@ -40,21 +40,21 @@ class LanzuEmployeesController extends AdminController return empty($item) ? '' : $item->name; }); - $grid->column('role')->display(function($role) use($roleList){ + $grid->column('position')->display(function($position) use($positionList){ $item = ''; - if(!empty($role) && is_array($role)){ - foreach($role as $key => $value){ - $item .= '【'.$roleList[$value].'】'; + if(!empty($position) && is_array($position)){ + foreach($position as $key => $value){ + $item .= '【'.$positionList[$value].'】'; } } return $item; }); $grid->column('status')->width(3)->select(EmployeesModel::$_STATUS); - $grid->filter(function (Grid\Filter $filter) use($marketList,$roleList){ + $grid->filter(function (Grid\Filter $filter) use($marketList,$positionList){ $filter->equal('id'); $filter->equal('market_id')->select($marketList); - $filter->equal('role')->select($roleList); + $filter->equal('position')->select($positionList); }); $grid->model()->orderBy('status','desc'); $grid->model()->orderBy('id','desc'); @@ -86,12 +86,12 @@ class LanzuEmployeesController extends AdminController $item = MarketModel::getMarketInfo($marketId,'name'); return empty($item) ? '' : $item->name; }); - $show->field('role')->as(function($role){ - $roleList = config('role.position'); + $show->field('position')->as(function($position){ + $positionList = config('position.position'); $item = ''; - if(!empty($role) && is_array($role)){ - foreach($role as $key => $value){ - $item .= ' 【'.$roleList[$value].'】'; + if(!empty($position) && is_array($position)){ + foreach($position as $key => $value){ + $item .= ' 【'.$positionList[$value].'】'; } } return $item; @@ -115,24 +115,36 @@ class LanzuEmployeesController extends AdminController //市场 $marketList = MarketModel::getMarketArray(); //店铺 - $storeList = StoreModel::getStoreArray(); + $storeList = StoreModel::getStoreArray([['market_id','=',1]]); // 用户 - $userList = UserModel::getUserArray(); + // $userList = UserModel::getUserArray(); // 已绑定的用户 - $userHas = EmployeesModel::pluck('user_id')->toArray(); - foreach($userList as $ku => $uv){ - if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ - unset($userList[$ku]); - } - } + // $userHas = EmployeesModel::pluck('user_id')->toArray(); + // foreach($userList as $ku => $uv){ + // if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ + // unset($userList[$ku]); + // } + // } $form->hidden('id'); - $form->select('user_id')->required()->options($userList); + // $form->select('user_id')->required()->options($userList); + $form->number('user_id')->required()->min(0); $form->select('market_id')->required()->options($marketList); - $form->multipleSelect('role')->required()->options(config('role.position')); + $form->multipleSelect('position')->required()->options(config('role.position')); $form->select('store_id')->options($storeList); $form->text('note')->maxLength(200); $form->hidden('status')->default(1); + $form->saving(function(Form $form){ + $id = $form->getKey(); + $userId = $form->input('user_id'); + $store = StoreModel::select('id')->where([ + ['user_id','=',$userId], + ['id','<>',$id?$id:0], + ])->first(); + if(!empty($store)){ + return $form->error('用户已经为懒族员工'); + } + }); $form->disableResetButton(); $form->disableViewCheck(); $form->disableEditingCheck(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 95e9c26..a69c6ff 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -153,6 +153,8 @@ class StoreController extends AdminController protected function form() { return Form::make(new Store(), function (Form $form) { + // $userId = $form->model()->user_id; + $adminId = $form->model()->admin_id; // 查询市场经理 // $mmList = MminfoModel::getMmInfoArray(); // 查询市场 @@ -160,15 +162,15 @@ class StoreController extends AdminController // 查询一级分类 $categoryList = CategoryModel::getArray([['parent_id','=',0]]); // 用户 - $userList = UserModel::getUserArray(); + // $userList = UserModel::getUserArray(); // 已绑定店铺的用户 - $userHas = StoreModel::pluck('admin_id')->toArray(); + // $userHas = StoreModel::pluck('admin_id')->toArray(); - foreach($userList as $ku => $uv){ - if($ku != 0 && in_array($ku,$userHas)){ - unset($userList[$ku]); - } - } + // foreach($userList as $ku => $uv){ + // if($ku != 0 && in_array($ku,$userHas) && !in_array($adminId,$userHas)){ + // unset($userList[$ku]); + // } + // } $form->column(6, function (Form $form) use($marketList,$categoryList){ $form->hidden('id'); @@ -197,12 +199,14 @@ class StoreController extends AdminController }); $form->text('address')->required(); }); - $form->column(6, function (Form $form) use($userList){ + $form->column(6, function (Form $form) { $form->image('business_license')->required()->uniqueName(); $form->image('zm_img')->required()->uniqueName(); $form->image('fm_img')->required()->uniqueName(); - $form->select('admin_id')->options($userList)->required(); - $form->select('user_id')->options($userList)->required(); + // $form->select('admin_id')->options($userList)->required(); + // $form->select('user_id')->options($userList)->required(); + $form->number('admin_id')->required()->min(0); + $form->number('user_id')->required()->min(0); $form->time('time1','时间段一开始')->format('HH:mm'); $form->time('time2','时间段一结束')->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']); $form->time('time3','时间段二开始')->format('HH:mm')->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间晚']); @@ -220,7 +224,17 @@ class StoreController extends AdminController // $form->text('coordinates')->width(4) // ->placeholder('输入 经纬度,如: 108.281552,22.83731') // ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度"); - + $form->saving(function(Form $form){ + $id = $form->getKey(); + $adminId = $form->input('admin_id'); + $store = StoreModel::select('id')->where([ + ['admin_id','=',$adminId], + ['id','<>',$id?$id:0], + ])->first(); + if(!empty($store)){ + return $form->error('管理员已经绑定了店铺'); + } + }); $form->saved(function (Form $form){ $id = $form->getKey(); $store = StoreModel::find($id); diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php index d213617..16ee132 100644 --- a/app/Models/v3/LanzuEmployees.php +++ b/app/Models/v3/LanzuEmployees.php @@ -17,7 +17,7 @@ class LanzuEmployees extends Model /* 查询记录数 limit */ protected $perPage = 10; protected $casts = [ - 'role'=>'array', + 'position'=>'array', ]; public static $_TYPE= ['']; public static $_STATUS = [-1=>'离职',0=>'禁用',1=>'正常']; diff --git a/app/Models/v3/Store.php b/app/Models/v3/Store.php index 0370a3b..2988381 100644 --- a/app/Models/v3/Store.php +++ b/app/Models/v3/Store.php @@ -87,12 +87,16 @@ class Store extends Model * id为键，name为值 * @return array */ - public static function getStoreArray() + public static function getStoreArray($where = [], $options = []) { - $list = self::select('id','name') + $model = self::select('id','name') ->where('status',2) - ->whereNull('deleted_at') - ->get(); + ->whereNull('deleted_at'); + + if(count($where) > 0){ + $model->where($where); + } + $list = $model->get(); $array = []; if(count($list) > 0){ foreach ($list as $value) { diff --git a/config/role.php b/config/role.php index 69ac526..97aa17e 100644 --- a/config/role.php +++ b/config/role.php @@ -1,6 +1,6 @@ [ diff --git a/resources/lang/zh-CN/lanzu-employees.php b/resources/lang/zh-CN/lanzu-employees.php index 10a010e..086d2d1 100644 --- a/resources/lang/zh-CN/lanzu-employees.php +++ b/resources/lang/zh-CN/lanzu-employees.php @@ -10,7 +10,7 @@ return [ 'user_id' => '用户懒ID', 'store_id' => '店铺', 'market_id' => '服务站', - 'role' => '用户角色', + 'position' => '职位', 'status' => '状态', 'status_text' => '状态', 'note' => '备注', From d0453fd61b68847238c75f5eb4219f7936f4f25a Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 15:32:35 +0800 Subject: [PATCH 15/56] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?json=E7=B1=BB=E5=9E=8B=E6=95=B0=E7=BB=84=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/v3/GoodsActivity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/v3/GoodsActivity.php b/app/Models/v3/GoodsActivity.php index 009ae4e..233bdc4 100644 --- a/app/Models/v3/GoodsActivity.php +++ b/app/Models/v3/GoodsActivity.php @@ -24,7 +24,7 @@ class GoodsActivity extends Model protected $casts = [ 'details_imgs'=>'array', // 'tags'=>'array', - // 'market_ids'=>'array', + 'market_ids'=>'array', 'spec'=>'array', ]; From 1c129be28d0239adf797e9feccc22294ed67d7ac Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 15:39:45 +0800 Subject: [PATCH 16/56] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/StoreController.php | 11 +++++++++-- app/Admin/Controllers/v3/UserController.php | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index a69c6ff..1a797b7 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -78,6 +78,9 @@ class StoreController extends AdminController // 每页10条 $grid->paginate(10); + + $grid->disableDeleteButton(); + }); } @@ -140,8 +143,11 @@ class StoreController extends AdminController $show->width(6)->loudspeaker_imei; }); - // $show->created_at; - // $show->updated_at; + $show->panel()->tools(function ($tools) { + + $tools->disableDelete(); + + }); }); } @@ -289,6 +295,7 @@ class StoreController extends AdminController $form->disableViewCheck(); $form->disableEditingCheck(); $form->disableCreatingCheck(); + $form->disableDeleteButton(); }); } diff --git a/app/Admin/Controllers/v3/UserController.php b/app/Admin/Controllers/v3/UserController.php index 957ae19..ecdfb1c 100644 --- a/app/Admin/Controllers/v3/UserController.php +++ b/app/Admin/Controllers/v3/UserController.php @@ -105,6 +105,7 @@ class UserController extends AdminController $form->disableViewCheck(); $form->disableEditingCheck(); $form->disableCreatingCheck(); + $form->disableDeleteButton(); }); } } From 34e7b2f3e9ee407f0a96328dfd0c0cf3aa6b4cb3 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 15:47:36 +0800 Subject: [PATCH 17/56] =?UTF-8?q?=E9=AA=91=E6=89=8B=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=87=92=E6=97=8F=E5=91=98=E5=B7=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImsCjdcOrderMainController.php | 2 -- app/Admin/Forms/SelectHorseman.php | 4 ++-- app/Models/LanzuServiceHorseman.php | 1 + app/Models/v3/LanzuEmployees.php | 21 ++++++++++++++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index d783935..32025ef 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -55,7 +55,6 @@ class ImsCjdcOrderMainController extends AdminController $grid->created_at('下单时间')->display(function ($time) { return date('Y-m-d H:i:s',$time); }); - $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) { $state = $actions->row->state; @@ -83,7 +82,6 @@ class ImsCjdcOrderMainController extends AdminController $grid->disableEditButton(); $grid->disableDeleteButton(); - }); } diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php index dd2d1a4..149b09a 100644 --- a/app/Admin/Forms/SelectHorseman.php +++ b/app/Admin/Forms/SelectHorseman.php @@ -4,6 +4,7 @@ namespace App\Admin\Forms; use App\Models\ImsCjdcOrderMain; use App\Models\LanzuServiceHorseman; +use App\Models\v3\LanzuEmployees; use Dcat\Admin\Widgets\Form; use Symfony\Component\HttpFoundation\Response; @@ -36,9 +37,8 @@ class SelectHorseman extends Form */ public function form() { - $this->select('horseman_id','配送员') - ->options(LanzuServiceHorseman::getHorseman()) + ->options(LanzuEmployees::getHorseman()) ->required(); $this->hidden('order_id')->value($this->data['order_id']); $this->hidden('current_page')->value($this->data['current_page']); diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php index d230d2f..868cde9 100644 --- a/app/Models/LanzuServiceHorseman.php +++ b/app/Models/LanzuServiceHorseman.php @@ -38,4 +38,5 @@ class LanzuServiceHorseman extends Model return '--'; } } + } diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php index d213617..b5125ec 100644 --- a/app/Models/v3/LanzuEmployees.php +++ b/app/Models/v3/LanzuEmployees.php @@ -37,7 +37,7 @@ class LanzuEmployees extends Model $value = $value ? $value : $this->status; return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; } - + /** * 根据id获取单条信息 * @param int $id @@ -69,4 +69,23 @@ class LanzuEmployees extends Model return array_flip($list); } } + + public static function getHorseman($marketId=null) + { + if ($marketId){ + $rows = self::where('market_id',$marketId) + ->where('position','REGEXP','"29"') + ->get(); + }else{ + $rows = self::where('position','REGEXP','"29"')->get(); + } + $item = []; + if ($rows){ + foreach ($rows as $row) { + $item[$row->id] = $row->name; + } + } + return $item; + } + } From c2ad68fee0a21d5a831c89bf8ce72289fc9158a9 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 15:59:56 +0800 Subject: [PATCH 18/56] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5-name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v3/LanzuEmployeesController.php | 22 +++++++++---------- app/Admin/Controllers/v3/StoreController.php | 4 ++-- resources/lang/zh-CN/lanzu-employees.php | 1 + 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index e8e2b6e..6a5e230 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -28,13 +28,14 @@ class LanzuEmployeesController extends AdminController $positionList = config('role.position'); $grid->column('id')->sortable(); + $grid->column('name'); $grid->column('market_id')->display(function($marketId) use($marketList){ return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; }); - $grid->column('user_id')->display(function($userId){ - $item = UserModel::getUserInfo($userId,'real_name'); - return empty($item) ? '' : $item->real_name; - }); + // $grid->column('user_id')->display(function($userId){ + // $item = UserModel::getUserInfo($userId,'real_name'); + // return empty($item) ? '' : $item->real_name; + // }); $grid->column('store_id')->display(function($storeId){ $item = StoreModel::getStoreInfo($storeId,'name'); return empty($item) ? '' : $item->name; @@ -74,10 +75,8 @@ class LanzuEmployeesController extends AdminController { return Show::make($id, new LanzuEmployees(), function (Show $show) { $show->field('id'); - $show->field('user_id')->as(function($userId){ - $item = UserModel::getUserInfo($userId,'real_name'); - return empty($item) ? '' : $item->real_name; - }); + $show->field('name'); + $show->field('user_id'); $show->field('store_id')->as(function($storeId){ $item = StoreModel::getStoreInfo($storeId,'name'); return empty($item) ? '' : $item->name; @@ -87,7 +86,7 @@ class LanzuEmployeesController extends AdminController return empty($item) ? '' : $item->name; }); $show->field('position')->as(function($position){ - $positionList = config('position.position'); + $positionList = config('role.position'); $item = ''; if(!empty($position) && is_array($position)){ foreach($position as $key => $value){ @@ -126,8 +125,9 @@ class LanzuEmployeesController extends AdminController // } // } $form->hidden('id'); - // $form->select('user_id')->required()->options($userList); $form->number('user_id')->required()->min(0); + // $form->select('user_id')->required()->options($userList); + $form->text('name','真实姓名')->width(4)->required(); $form->select('market_id')->required()->options($marketList); $form->multipleSelect('position')->required()->options(config('role.position')); $form->select('store_id')->options($storeList); @@ -137,7 +137,7 @@ class LanzuEmployeesController extends AdminController $form->saving(function(Form $form){ $id = $form->getKey(); $userId = $form->input('user_id'); - $store = StoreModel::select('id')->where([ + $store = EmployeesModel::select('id')->where([ ['user_id','=',$userId], ['id','<>',$id?$id:0], ])->first(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 1a797b7..6c5b5d2 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -213,8 +213,8 @@ class StoreController extends AdminController // $form->select('user_id')->options($userList)->required(); $form->number('admin_id')->required()->min(0); $form->number('user_id')->required()->min(0); - $form->time('time1','时间段一开始')->format('HH:mm'); - $form->time('time2','时间段一结束')->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']); + $form->time('time1','时间段一开始')->required()->format('HH:mm'); + $form->time('time2','时间段一结束')->required()->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']); $form->time('time3','时间段二开始')->format('HH:mm')->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间晚']); $form->time('time4','时间段二结束')->format('HH:mm')->rules('after:time3',['after'=>'选择的时间必须比时间段二开始时间晚']); // $form->timeRange('time1','time2','营业时间段一')->required(); diff --git a/resources/lang/zh-CN/lanzu-employees.php b/resources/lang/zh-CN/lanzu-employees.php index 086d2d1..6420fab 100644 --- a/resources/lang/zh-CN/lanzu-employees.php +++ b/resources/lang/zh-CN/lanzu-employees.php @@ -9,6 +9,7 @@ return [ 'fields' => [ 'user_id' => '用户懒ID', 'store_id' => '店铺', + 'name' => '姓名', 'market_id' => '服务站', 'position' => '职位', 'status' => '状态', From 60965a03690f4448ca464966e94a8bb01b2a7948 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 16:25:23 +0800 Subject: [PATCH 19/56] =?UTF-8?q?=E4=BA=8C=E7=94=9F=E6=88=90=E5=95=86?= =?UTF-8?q?=E6=88=B7=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/StoreQRCode.php | 122 ------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 app/Admin/Common/StoreQRCode.php diff --git a/app/Admin/Common/StoreQRCode.php b/app/Admin/Common/StoreQRCode.php deleted file mode 100644 index dac7c24..0000000 --- a/app/Admin/Common/StoreQRCode.php +++ /dev/null @@ -1,122 +0,0 @@ -images = new Images(); - // $this->imageManager = new ImageManager(); - } - - /** - * 生成小程序码 永久 还没完成 - * @param $scene 参数 - * @param $optional - */ - public function getUnlimited(string $scene, array $optional = []) - { - $wxCode = Factory::payment(config('wechat.mini_program.default')); - $res = $wxCode->app_code->getUnlimited($scene,$optional); - - } - - /** - * 生成店铺的微信小程序码 - */ - public function SetStoreWeChatCode($id) - { - $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/takeout/takeoutindex'); - $storeImgPath = 'QR_code/code_store_img/wx_store_'.$id.'.jpg'; - $res = $this->images->uploadOss($codeStore,$storeImgPath); - if($res){ - return ['status' => true ,'path' => $storeImgPath]; - }else{ - return ['status' => false ,'path' => '']; - } - } - /** - * 生成店铺收银的微信二维码 - */ - public function SetPayWeChatCode($id) - { - // $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1); - // if($isCREATE == 0){ - $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/seller/fukuan'); - $storeImgPath = 'QR_code/code_minipay_img/wx_minipay_'.$id.'.jpg'; - // }else{ - // $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan'); - // $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg'; - // // 裁剪 - - // } - - // 裁剪测试 - // $this->imageManager->make()->resize(270,270)->insert($codeStore); - - $res = $this->images->uploadOss($codeStore,$storeImgPath); - if($res){ - return ['status' => true ,'path' => $storeImgPath]; - }else{ - return ['status' => false ,'path' => '']; - } - } - - /** - * 店铺收银码裁剪 - */ - public function setStoreCodeImg($file_path,$storeId){ - - $save_path = './QR_code/wx_store_pay_cut/wx_pay_'.$storeId.'.jpg'; - - if(!file_exists($save_path)){ - //将图片进行裁剪 - if(file_exists($file_path)){ - $save_width = 270; - $start_spot_x = 5; - $start_spot_y = 5; - $width = 270; - $height = 270; - - $this->tailoringImg($save_path,$file_path,$save_width,$start_spot_x,$start_spot_y,$width,$height,1); - }else{ - return ''; - } - } - return $save_path; - } - - /** - * 裁剪图片 - */ - public function tailoringImg($save_path,$file_path,$save_width,$start_spot_x,$start_spot_y,$width,$height,$display=1) - { - if(file_exists($file_path) && is_readable($file_path)){ - //从字符串中的图像流新建一图像 - $src = imagecreatefromstring(file_get_contents($file_path)); - - //保存图片的高 - $save_height = round($save_width*$height/$width); - - //根据要保存的宽和高创建图片 - $new_image = imagecreatetruecolor($save_width, $save_height); - - //生成最后的图片 - imagecopyresampled($new_image, $src, 0, 0, $start_spot_x, $start_spot_y, $save_width, $save_height, $width, $height); - - // header('Content-Type: image/jpeg'); - imagejpeg($new_image,$save_path); - imagedestroy($src); - imagedestroy($new_image); - } - } - -} From 7fe0f517e361217c0be77556ca47d9298b29999c Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 16:26:37 +0800 Subject: [PATCH 20/56] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/StoreQRCode.php | 122 ------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 app/Admin/Common/StoreQRCode.php diff --git a/app/Admin/Common/StoreQRCode.php b/app/Admin/Common/StoreQRCode.php deleted file mode 100644 index dac7c24..0000000 --- a/app/Admin/Common/StoreQRCode.php +++ /dev/null @@ -1,122 +0,0 @@ -images = new Images(); - // $this->imageManager = new ImageManager(); - } - - /** - * 生成小程序码 永久 还没完成 - * @param $scene 参数 - * @param $optional - */ - public function getUnlimited(string $scene, array $optional = []) - { - $wxCode = Factory::payment(config('wechat.mini_program.default')); - $res = $wxCode->app_code->getUnlimited($scene,$optional); - - } - - /** - * 生成店铺的微信小程序码 - */ - public function SetStoreWeChatCode($id) - { - $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/takeout/takeoutindex'); - $storeImgPath = 'QR_code/code_store_img/wx_store_'.$id.'.jpg'; - $res = $this->images->uploadOss($codeStore,$storeImgPath); - if($res){ - return ['status' => true ,'path' => $storeImgPath]; - }else{ - return ['status' => false ,'path' => '']; - } - } - /** - * 生成店铺收银的微信二维码 - */ - public function SetPayWeChatCode($id) - { - // $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1); - // if($isCREATE == 0){ - $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/seller/fukuan'); - $storeImgPath = 'QR_code/code_minipay_img/wx_minipay_'.$id.'.jpg'; - // }else{ - // $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan'); - // $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg'; - // // 裁剪 - - // } - - // 裁剪测试 - // $this->imageManager->make()->resize(270,270)->insert($codeStore); - - $res = $this->images->uploadOss($codeStore,$storeImgPath); - if($res){ - return ['status' => true ,'path' => $storeImgPath]; - }else{ - return ['status' => false ,'path' => '']; - } - } - - /** - * 店铺收银码裁剪 - */ - public function setStoreCodeImg($file_path,$storeId){ - - $save_path = './QR_code/wx_store_pay_cut/wx_pay_'.$storeId.'.jpg'; - - if(!file_exists($save_path)){ - //将图片进行裁剪 - if(file_exists($file_path)){ - $save_width = 270; - $start_spot_x = 5; - $start_spot_y = 5; - $width = 270; - $height = 270; - - $this->tailoringImg($save_path,$file_path,$save_width,$start_spot_x,$start_spot_y,$width,$height,1); - }else{ - return ''; - } - } - return $save_path; - } - - /** - * 裁剪图片 - */ - public function tailoringImg($save_path,$file_path,$save_width,$start_spot_x,$start_spot_y,$width,$height,$display=1) - { - if(file_exists($file_path) && is_readable($file_path)){ - //从字符串中的图像流新建一图像 - $src = imagecreatefromstring(file_get_contents($file_path)); - - //保存图片的高 - $save_height = round($save_width*$height/$width); - - //根据要保存的宽和高创建图片 - $new_image = imagecreatetruecolor($save_width, $save_height); - - //生成最后的图片 - imagecopyresampled($new_image, $src, 0, 0, $start_spot_x, $start_spot_y, $save_width, $save_height, $width, $height); - - // header('Content-Type: image/jpeg'); - imagejpeg($new_image,$save_path); - imagedestroy($src); - imagedestroy($new_image); - } - } - -} From 23de30234b700ffcde1c36ca0f130eb60841124c Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 16:27:33 +0800 Subject: [PATCH 21/56] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/StoreQrCode.php | 122 +++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 app/Admin/Common/StoreQrCode.php diff --git a/app/Admin/Common/StoreQrCode.php b/app/Admin/Common/StoreQrCode.php new file mode 100644 index 0000000..dac7c24 --- /dev/null +++ b/app/Admin/Common/StoreQrCode.php @@ -0,0 +1,122 @@ +images = new Images(); + // $this->imageManager = new ImageManager(); + } + + /** + * 生成小程序码 永久 还没完成 + * @param $scene 参数 + * @param $optional + */ + public function getUnlimited(string $scene, array $optional = []) + { + $wxCode = Factory::payment(config('wechat.mini_program.default')); + $res = $wxCode->app_code->getUnlimited($scene,$optional); + + } + + /** + * 生成店铺的微信小程序码 + */ + public function SetStoreWeChatCode($id) + { + $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/takeout/takeoutindex'); + $storeImgPath = 'QR_code/code_store_img/wx_store_'.$id.'.jpg'; + $res = $this->images->uploadOss($codeStore,$storeImgPath); + if($res){ + return ['status' => true ,'path' => $storeImgPath]; + }else{ + return ['status' => false ,'path' => '']; + } + } + /** + * 生成店铺收银的微信二维码 + */ + public function SetPayWeChatCode($id) + { + // $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1); + // if($isCREATE == 0){ + $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/seller/fukuan'); + $storeImgPath = 'QR_code/code_minipay_img/wx_minipay_'.$id.'.jpg'; + // }else{ + // $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan'); + // $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg'; + // // 裁剪 + + // } + + // 裁剪测试 + // $this->imageManager->make()->resize(270,270)->insert($codeStore); + + $res = $this->images->uploadOss($codeStore,$storeImgPath); + if($res){ + return ['status' => true ,'path' => $storeImgPath]; + }else{ + return ['status' => false ,'path' => '']; + } + } + + /** + * 店铺收银码裁剪 + */ + public function setStoreCodeImg($file_path,$storeId){ + + $save_path = './QR_code/wx_store_pay_cut/wx_pay_'.$storeId.'.jpg'; + + if(!file_exists($save_path)){ + //将图片进行裁剪 + if(file_exists($file_path)){ + $save_width = 270; + $start_spot_x = 5; + $start_spot_y = 5; + $width = 270; + $height = 270; + + $this->tailoringImg($save_path,$file_path,$save_width,$start_spot_x,$start_spot_y,$width,$height,1); + }else{ + return ''; + } + } + return $save_path; + } + + /** + * 裁剪图片 + */ + public function tailoringImg($save_path,$file_path,$save_width,$start_spot_x,$start_spot_y,$width,$height,$display=1) + { + if(file_exists($file_path) && is_readable($file_path)){ + //从字符串中的图像流新建一图像 + $src = imagecreatefromstring(file_get_contents($file_path)); + + //保存图片的高 + $save_height = round($save_width*$height/$width); + + //根据要保存的宽和高创建图片 + $new_image = imagecreatetruecolor($save_width, $save_height); + + //生成最后的图片 + imagecopyresampled($new_image, $src, 0, 0, $start_spot_x, $start_spot_y, $save_width, $save_height, $width, $height); + + // header('Content-Type: image/jpeg'); + imagejpeg($new_image,$save_path); + imagedestroy($src); + imagedestroy($new_image); + } + } + +} From 24a3b0dc6430fd93c6bbdc5006be26c72ebc169b Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 16:56:01 +0800 Subject: [PATCH 22/56] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Rpc.php | 23 +++++++++++++++++++++++ app/Admin/Common/Sms.php | 40 ++-------------------------------------- 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index 235a302..d980c3d 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -14,6 +14,7 @@ class Rpc const ORDER_SINGLE_REFUND = "/order/onlineSingleRefund"; const GET_DISTANCE = "/location/getDistanceByTencent"; const DO_BY_ORDER = "/badge/doByOrder"; + const ALI_SMS_SENT = "/alisms/sent"; @@ -112,5 +113,27 @@ class Rpc return json_decode($response->getBody()->getContents(),true); } + /** + * 阿里大于 + * @param $phone + * @param $template + * @param $templateParams + * @param string $signName + * @return string + */ + public static function alisSmsSent($phone, $template, $templateParams, $signName='懒族生活'){ + $client = Client::factory(env('RPC_SITE_HOST')); + $request = $client->request(uniqid(), + self::ALI_SMS_SENT, + [ + 'phone' => $phone, + 'template'=>$template, + 'templateParams'=> json_encode($templateParams), + 'signName'=>$signName, + ]); + $response = $client->send($request); + return $response->getBody()->getContents(); + } + } diff --git a/app/Admin/Common/Sms.php b/app/Admin/Common/Sms.php index 70df640..ced4e28 100644 --- a/app/Admin/Common/Sms.php +++ b/app/Admin/Common/Sms.php @@ -12,34 +12,6 @@ use Graze\GuzzleHttp\JsonRpc\Client; class Sms extends AdminController { - /** - * 发送短信 - * @throws ClientException - */ - public static function sent($params) - { - AlibabaCloud::accessKeyClient(env('ACCESS_KEY_ID'),env('ACCESS_SECRET')) - ->regionId('cn-shenzhen') - ->asDefaultClient(); - try { - $result = AlibabaCloud::rpc() - ->product('Dysmsapi') - ->version('2017-05-25') - ->action('SendSms') - ->method('POST') - ->host('dysmsapi.aliyuncs.com') - ->options([ - 'query' => $params, - ]) - ->request(); - dd($result); - }catch (ClientException $e){ - echo $e->getErrorMessage() . PHP_EOL; - }catch (ServerException $e){ - echo $e->getErrorMessage() . PHP_EOL; - } - } - /** * 远程RPC调用 * @param $phone @@ -48,16 +20,8 @@ class Sms extends AdminController * @param string $signName * @return string */ - public static function rpcSent($phone, $template, $templateParams, $signName='懒族生活') + public static function rpcSent($phone, $template, $templateParams, $signName) { - $client = Client::factory(env('RPC_SITE_HOST')); - $request = $client->request(uniqid(),'/alisms/sent', [ - 'phone' => $phone, - 'template'=>$template, - 'templateParams'=> json_encode($templateParams), - 'signName'=>$signName, - ]); - $response = $client->send($request); - return $response->getBody()->getContents(); + return Rpc::alisSmsSent($phone, $template, $templateParams, $signName); } } From 65c58fd26e5e0030690502db13e91e77dc75ea20 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 17:10:28 +0800 Subject: [PATCH 23/56] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E6=B5=81=E6=B0=B4=E6=90=9C=E7=B4=A2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuFinancialRecord.php | 3 +++ app/Admin/Controllers/LanzuMpInfoController.php | 5 +++++ app/Models/LanzuMpInfo.php | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/app/Admin/Controllers/LanzuFinancialRecord.php b/app/Admin/Controllers/LanzuFinancialRecord.php index afd09ef..f2640de 100644 --- a/app/Admin/Controllers/LanzuFinancialRecord.php +++ b/app/Admin/Controllers/LanzuFinancialRecord.php @@ -9,6 +9,7 @@ use App\Models\FinancialRecord; use App\Models\FinancialRecord0; use App\Models\ImsCjdcUser; use App\Models\LanzuCsInfo; +use App\Models\LanzuMpInfo; use Dcat\Admin\Admin; use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Form; @@ -60,6 +61,8 @@ class LanzuFinancialRecord extends AdminController $filter->equal('id'); if (!$adu->isRole('lanzu_cs')&&$type==4) { $filter->equal('user_id', '社区站点')->select(LanzuCsInfo::selectCsInfo()); + }elseif (!$adu->isRole('lanzu_mp')&&$type==2){ + $filter->equal('user_id', '服务商')->select(LanzuMpInfo::selectCsInfo()); } }); diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index ec99507..fb18e09 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -193,6 +193,10 @@ class LanzuMpInfoController extends AdminController }); } + /** + * @param Content $content + * @return Content + */ public function showData(Content $content) { return $content->header('控制面板') @@ -204,4 +208,5 @@ class LanzuMpInfoController extends AdminController }); } + } diff --git a/app/Models/LanzuMpInfo.php b/app/Models/LanzuMpInfo.php index 3dc5aa8..491082f 100644 --- a/app/Models/LanzuMpInfo.php +++ b/app/Models/LanzuMpInfo.php @@ -14,4 +14,18 @@ class LanzuMpInfo extends Model protected $table = 'lanzu_mp_info'; protected $dateFormat = 'U'; + /** + * @return array + */ + public static function selectCsInfo() + { + $rows = self::get(); + $item = []; + if ($rows){ + foreach ($rows as $row){ + $item[$row->admin_user_id] = $row->name; + } + } + return $item; + } } From 6e2a2faa935078419def17964ca3bdebff8be6eb Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 17:19:34 +0800 Subject: [PATCH 24/56] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/StoreController.php | 33 +++++++++++++++++--- config/filesystems.php | 1 + resources/lang/zh-CN/store.php | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 6c5b5d2..8f1917c 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -56,7 +56,7 @@ class StoreController extends AdminController // ->image('',50); $grid->cash_code_img->display(function($appletImg){ $id = $this->id; - $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'; + $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize'); $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; $img = ""; @@ -122,6 +122,31 @@ class StoreController extends AdminController $show->width(6)->business_license->image(); $show->width(6)->zm_img->image(); $show->width(6)->fm_img->image(); + + $id = 380; + $storeAppletImg = '380'; + $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg'; + $path = empty($storeAppletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'; + // $img = ""; + $show->store_applet_img->image($path); + // ->as(function($appletImg){ + // $id = $this->id; + // $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg'; + // $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; + // $img = ""; + + // return $img; + // }); + $cashCodeImg = ''; + $show->cash_code_img->as(function($appletImg){ + $id = $this->id; + $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize'); + $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; + $img = ""; + + return $img; + }); + $show->width(6)->tel; $show->width(6)->link_name; $show->width(6)->link_tel; @@ -268,10 +293,10 @@ class StoreController extends AdminController // 保存图片 $store->store_applet_img = $sRes['status'] ? $sRes['path'] : ''; - $store->cash_code_img = $pRes['status'] ? $pRes['path'] : ''; + $cashImg = $pRes['status'] ? $pRes['path'] : ''; + // 保存剪裁图片 + $store->cash_code_img = $cashImg.config('filesystems.disks.oss.store_image_resize'); $store->save(); - // 剪裁图片 - // $form->image('cash_code_img')->crop(270, 270, [5, 5])->uniqueName(); //店长账号 $storeUsersInfo = StoreUsersModel::where('store_id',$id)->where('user_category',1)->first(); diff --git a/config/filesystems.php b/config/filesystems.php index 1f00391..ae8a732 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -73,6 +73,7 @@ return [ 'buckets'=>[ ], 'img_host' => env('OSS_IMG_HOST'), + 'store_image_resize' => '?x-oss-process=image/crop,x_5,y_5,w_270,h_270' ], 's3' => [ diff --git a/resources/lang/zh-CN/store.php b/resources/lang/zh-CN/store.php index 1b47620..c414316 100644 --- a/resources/lang/zh-CN/store.php +++ b/resources/lang/zh-CN/store.php @@ -9,7 +9,7 @@ return [ 'market_name' => '所属市场', 'name' => '商家名称', 'address' => '商家地址', - 'time' => '营业时间', + 'time1' => '营业时间', 'time2' => '营业时间', 'time3' => '营业时间', 'time4' => '营业时间', From b67260cc71606e051104395ec2150b3aacf805df Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 17:35:28 +0800 Subject: [PATCH 25/56] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E8=A3=81=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/StoreController.php | 36 ++++---------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 8f1917c..6ed6431 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -49,7 +49,7 @@ class StoreController extends AdminController $id = $this->id; $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg'; $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; - $img = ""; + $img = ""; return $img; }); @@ -58,7 +58,7 @@ class StoreController extends AdminController $id = $this->id; $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize'); $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; - $img = ""; + $img = ""; return $img; }); @@ -105,10 +105,6 @@ class StoreController extends AdminController $item = MarketModel::getMarketInfo($marketId,'name'); return empty($item) ? '' : $item->name; }); - $show->width(6)->category_id->as(function ($categoryId){ - $item = CategoryModel::getInfo($categoryId,'title'); - return empty($item) ? '' : $item->title; - }); $show->width(6)->name; $show->width(6)->logo->image(); $show->width(6)->user_id->as(function ($userId){ @@ -123,30 +119,12 @@ class StoreController extends AdminController $show->width(6)->zm_img->image(); $show->width(6)->fm_img->image(); - $id = 380; - $storeAppletImg = '380'; - $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg'; - $path = empty($storeAppletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'; - // $img = ""; - $show->store_applet_img->image($path); - // ->as(function($appletImg){ - // $id = $this->id; - // $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg'; - // $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; - // $img = ""; - - // return $img; - // }); - $cashCodeImg = ''; - $show->cash_code_img->as(function($appletImg){ - $id = $this->id; - $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize'); - $path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg; - $img = ""; - - return $img; + $show->store_applet_img->width(6)->image(); + $show->cash_code_img->width(6)->image(); + $show->width(6)->category_id->as(function ($categoryId){ + $item = CategoryModel::getInfo($categoryId,'title'); + return empty($item) ? '' : $item->title; }); - $show->width(6)->tel; $show->width(6)->link_name; $show->width(6)->link_tel; From b6bb4e4b592ae3a686e7da4ff8cbc6362815b42f Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 17:56:19 +0800 Subject: [PATCH 26/56] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Rpc.php | 16 ++++++++++++++++ app/Admin/Extensions/OrderPrint.php | 20 ++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index d980c3d..544ab71 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -15,6 +15,7 @@ class Rpc const GET_DISTANCE = "/location/getDistanceByTencent"; const DO_BY_ORDER = "/badge/doByOrder"; const ALI_SMS_SENT = "/alisms/sent"; + const FEI_E_PRINT = '/feie/doPrint'; @@ -135,5 +136,20 @@ class Rpc return $response->getBody()->getContents(); } + /** + * 订单打印 + * @param $oid + * @return string + */ + public static function doPrint($oid) + { + $client = Client::factory(env('RPC_SITE_HOST')); + $request = $client->request(uniqid(), + self::FEI_E_PRINT, + ['oid' => $oid] + ); + $response = $client->send($request); + return $response->getBody()->getContents(); + } } diff --git a/app/Admin/Extensions/OrderPrint.php b/app/Admin/Extensions/OrderPrint.php index c37c576..74eb744 100644 --- a/app/Admin/Extensions/OrderPrint.php +++ b/app/Admin/Extensions/OrderPrint.php @@ -4,6 +4,7 @@ namespace App\Admin\Extensions; +use App\Admin\Common\Rpc; use App\Models\Feprint; use App\Models\ImsCjdcOrderMain; use Dcat\Admin\Grid\RowAction; @@ -44,7 +45,6 @@ class OrderPrint extends RowAction public function doPrint($oid) { - $row = ImsCjdcOrderMain::find($oid); //>>1.获取打印机状态 @@ -52,7 +52,7 @@ class OrderPrint extends RowAction //>>2.调用打印 if ($result == 1) { - $res = $this->rpcPrint($oid); + $res = Rpc::doPrint($row->global_order_id); $res = json_decode($res, true)['result']; $res = json_decode($res); @@ -81,20 +81,4 @@ class OrderPrint extends RowAction return -1; } } - - - public function rpcPrint($oid) - { - $client = Client::factory(env('RPC_SITE_HOST')); - $request = $client->request(uniqid(), '/feie/doPrint', ['oid' => $oid]); - $response = $client->send($request); - return $response->getBody()->getContents(); - } - - public function feiErPrint($order_num) - { - include_once app_path('Libs\feier_print\api_php_demo.php'); - $result = json_decode(FeiePrint($order_num)); - dd($result); - } } From 78bc4cc8db83989a5bc39fb16d148d2f7f950cc9 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 17:59:30 +0800 Subject: [PATCH 27/56] =?UTF-8?q?=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Rpc.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index 544ab71..9df0fe3 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -9,13 +9,13 @@ use Graze\GuzzleHttp\JsonRpc\Client; class Rpc { - const SEPARATE_ACCOUNTS = "/order/onlineComplete"; - const ORDER_REFUND = "/order/onlineRefund"; - const ORDER_SINGLE_REFUND = "/order/onlineSingleRefund"; - const GET_DISTANCE = "/location/getDistanceByTencent"; - const DO_BY_ORDER = "/badge/doByOrder"; - const ALI_SMS_SENT = "/alisms/sent"; - const FEI_E_PRINT = '/feie/doPrint'; + const SEPARATE_ACCOUNTS = "/order/onlineComplete";//订单完成 + const ORDER_REFUND = "/order/onlineRefund";//整笔订单退款 + const ORDER_SINGLE_REFUND = "/order/onlineSingleRefund";//订单单个商品退款 + const GET_DISTANCE = "/location/getDistanceByTencent";//获取骑行距离 + const DO_BY_ORDER = "/badge/doByOrder";//订单状态变更 + const ALI_SMS_SENT = "/alisms/sent";//发短信 + const FEI_E_PRINT = '/feie/doPrint';//订单打印 From 6cbb75c66156143c189242b2a589598e9a0c6767 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 19:45:02 +0800 Subject: [PATCH 28/56] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8E=E5=B8=82=E5=9C=BA=E5=85=B3=E8=81=94=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LanzuAdminUserMarketController.php | 99 +++++++++ .../Repositories/LanzuAdminUserMarket.php | 16 ++ app/Admin/routes.php | 1 + app/Models/LanzuAdminUserMarket.php | 15 ++ dcat_admin_ide_helper.php | 192 +++++++++--------- .../lang/zh-CN/lanzu-admin-user-market.php | 13 ++ 6 files changed, 240 insertions(+), 96 deletions(-) create mode 100644 app/Admin/Controllers/LanzuAdminUserMarketController.php create mode 100644 app/Admin/Repositories/LanzuAdminUserMarket.php create mode 100644 app/Models/LanzuAdminUserMarket.php create mode 100644 resources/lang/zh-CN/lanzu-admin-user-market.php diff --git a/app/Admin/Controllers/LanzuAdminUserMarketController.php b/app/Admin/Controllers/LanzuAdminUserMarketController.php new file mode 100644 index 0000000..8207fe3 --- /dev/null +++ b/app/Admin/Controllers/LanzuAdminUserMarketController.php @@ -0,0 +1,99 @@ +column('id')->sortable(); + $grid->column('admin_user_id','用户名')->display(function (){ + return AdminUsers::where('id',$this->admin_user_id)->first()->name; + }); + $grid->column('market_id','关联市场')->display(function (){ + return Market::where('id',$this->market_id)->first()->name; + }); + $grid->column('created_at')->display(function ($time){ + return date('Y-m-d H:i:s',$time); + }); + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id'); + + }); + + $grid->disableViewButton(); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new LanzuAdminUserMarket(), function (Show $show) { + $show->field('id'); + $show->field('admin_user_id'); + $show->field('market_id'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + $this->getAdminUser(); + return Form::make(new LanzuAdminUserMarket(), function (Form $form) { + $form->display('id'); + if ($form->isCreating()){ + $aumIds = \App\Models\LanzuAdminUserMarket::pluck('admin_user_id')->toArray(); + $form->select('admin_user_id','用户名')->options($this->getAdminUser($aumIds)); + }else{ + $form->select('admin_user_id','用户名')->options($this->getAdminUser(null))->disable(); + } + $form->select('market_id','关联市场')->options($this->getMarket()); + $form->disableViewButton(); + $form->disableEditingCheck(); + $form->disableCreatingCheck(); + $form->disableViewCheck(); + }); + } + + public function getAdminUser($aumIds=null) + { + if ($aumIds){ + $data = AdminUsers::whereNotIn('id',$aumIds)->pluck('name','id')->toArray(); + }else{ + $data = AdminUsers::pluck('name','id')->toArray(); + } + return $data; + } + + public function getMarket() + { + $data = Market::where('status',1)->pluck('name','id')->toArray(); + return $data; + } +} diff --git a/app/Admin/Repositories/LanzuAdminUserMarket.php b/app/Admin/Repositories/LanzuAdminUserMarket.php new file mode 100644 index 0000000..b23bb32 --- /dev/null +++ b/app/Admin/Repositories/LanzuAdminUserMarket.php @@ -0,0 +1,16 @@ +resource('/cs_withdraw', 'LanzuCsWithdrawController'); $router->resource('/service_reward', 'LanzuServiceRewardController'); $router->resource('/financial_record', 'LanzuFinancialRecord'); + $router->resource('/admin_user_market', 'LanzuAdminUserMarketController'); $router->any('/mm_list', 'LanzuMmWithdrawController@mmInfoList'); $router->any('/api/getMarket', 'LanzuMmInfoController@getMarket'); diff --git a/app/Models/LanzuAdminUserMarket.php b/app/Models/LanzuAdminUserMarket.php new file mode 100644 index 0000000..ac4b797 --- /dev/null +++ b/app/Models/LanzuAdminUserMarket.php @@ -0,0 +1,15 @@ + [ + 'LanzuAdminUserMarket' => '用户市场关联', + 'admin_user_market'=>'用户关联市场' + ], + 'fields' => [ + 'admin_user_id' => '用户登陆账号ID', + 'market_id' => '市场ID', + ], + 'options' => [ + ], +]; From 3c96291aeb2574f23f833ab1482b5ac23374973f Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 19:57:12 +0800 Subject: [PATCH 29/56] =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=20=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Auth.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Admin/Common/Auth.php b/app/Admin/Common/Auth.php index 33c8e79..699a1d3 100644 --- a/app/Admin/Common/Auth.php +++ b/app/Admin/Common/Auth.php @@ -5,6 +5,7 @@ namespace App\Admin\Common; use App\Models\AdminRoles; use App\Models\AdminRoleUsers; use App\Models\AdminUsers; +use App\Models\LanzuAdminUserMarket; use App\Models\LanzuUserBalance; use Dcat\Admin\Admin; use Dcat\Admin\Controllers\AdminController; @@ -67,9 +68,9 @@ class Auth extends AdminController public static function getMarket() { $adu = Admin::user(); - if (in_array($adu->id,config('market_service.admin_user_id'))){ - $marketId = config('market_service.market_id')[$adu->id]; - return $marketId; + $row = LanzuAdminUserMarket::where('admin_user_id',$adu->id)->first(); + if ($row){ + return $row->market_id; } return false; } From f911ae4a2172047a387a0a01078ff5b1d031e811 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 15 Sep 2020 20:10:39 +0800 Subject: [PATCH 30/56] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/BannersController.php | 2 +- .../Controllers/v3/CategoryController.php | 2 +- .../v3/GoodsActivityController.php | 6 ++-- .../v3/GoodsCategoryController.php | 2 +- app/Admin/Controllers/v3/GoodsController.php | 6 ++-- .../Controllers/v3/GoodsNewController.php | 6 ++-- .../v3/ServicePersonnelController.php | 2 +- app/Admin/Controllers/v3/StoreController.php | 33 +++++++++++-------- 8 files changed, 33 insertions(+), 26 deletions(-) diff --git a/app/Admin/Controllers/v3/BannersController.php b/app/Admin/Controllers/v3/BannersController.php index 1acb0fb..92576a9 100644 --- a/app/Admin/Controllers/v3/BannersController.php +++ b/app/Admin/Controllers/v3/BannersController.php @@ -105,7 +105,7 @@ class BannersController extends AdminController }); }); $form->column(6, function (Form $form) { - $form->image('cover')->required()->uniqueName(); + $form->image('cover')->autoUpload()->required()->uniqueName(); $form->select('cover_type')->options(BannersModel::$_COVER_TYPE)->required(); $form->text('path')->default(''); $form->select('path_type')->options(BannersModel::$_PATH_TYPE)->default(''); diff --git a/app/Admin/Controllers/v3/CategoryController.php b/app/Admin/Controllers/v3/CategoryController.php index 796df82..b051b19 100644 --- a/app/Admin/Controllers/v3/CategoryController.php +++ b/app/Admin/Controllers/v3/CategoryController.php @@ -53,7 +53,7 @@ class CategoryController extends AdminController $form->select('parent_id')->default(0)->options($parentList); $form->text('title')->required(); - $form->image('cover_img')->required()->uniqueName(); + $form->image('cover_img')->autoUpload()->required()->uniqueName(); $form->number('sort'); diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 57b9730..968e61c 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -142,7 +142,7 @@ class GoodsActivityController extends AdminController $form->select('goods_category_id'); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); - $form->image('cover_img')->required()->uniqueName(); + $form->image('cover_img')->autoUpload()->required(); $form->select('type')->options(GoodsActivityModel::$_TYPE)->default('flash_sale'); $form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->help($form->model()->expire_time_text); }); @@ -161,13 +161,13 @@ class GoodsActivityController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->width(2)->uniqueName(); + $form->image('path')->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); $form->divider(); $form->hasMany('video_banners', function (Form\NestedForm $form) { - $form->file('path')->width(2)->uniqueName(); + $form->file('path')->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/GoodsCategoryController.php b/app/Admin/Controllers/v3/GoodsCategoryController.php index fb84a0f..c268b1a 100644 --- a/app/Admin/Controllers/v3/GoodsCategoryController.php +++ b/app/Admin/Controllers/v3/GoodsCategoryController.php @@ -75,7 +75,7 @@ class GoodsCategoryController extends AdminController $category = CategoryModel::getArray([['parent_id','>',0]]); $form->select('category_id')->width(4)->required()->options($category); $form->text('title')->width(4)->required(); - $form->image('cover_img')->width(2)->uniqueName(); + $form->image('cover_img')->autoUpload()->width(2)->uniqueName(); $form->number('sort'); $form->disableResetButton(); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 48c761f..6832a97 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -165,7 +165,7 @@ class GoodsController extends AdminController $form->select('goods_category_id')->required(); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); - $form->image('cover_img')->required()->uniqueName(); + $form->image('cover_img')->autoUpload()->required(); $form->number('sort'); }); $form->column(6, function (Form $form) { @@ -180,13 +180,13 @@ class GoodsController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_banners', function (Form\NestedForm $form) { - $form->image('path')->required()->width(2)->uniqueName(); + $form->image('path')->autoUpload()->required()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); $form->divider(); $form->hasMany('video_banners', function (Form\NestedForm $form) { - $form->file('path')->width(2); + $form->file('path')->autoUpload()->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 191e2f6..5d87537 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -184,7 +184,7 @@ class GoodsNewController extends AdminController $form->select('goods_category_id'); $form->select('store_id')->required()->options($storeList); $form->text('name')->required()->maxLength(20); - $form->image('cover_img')->url('ops/files')->required(); + $form->image('cover_img')->autoUpload()->url('ops/files')->required(); $form->number('sort'); }); $form->column(6, function (Form $form) { @@ -199,13 +199,13 @@ class GoodsNewController extends AdminController }); $form->column(12, function (Form $form) { $form->hasMany('image_new_banners', function (Form\NestedForm $form) { - $form->image('path')->url('ops/files')->width(2); + $form->image('path')->autoUpload()->url('ops/files')->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(1)->default(1); })->required(); $form->divider(); $form->hasMany('video_new_banners', function (Form\NestedForm $form) { - $form->file('path')->url('ops/files')->width(2); + $form->file('path')->autoUpload()->url('ops/files')->width(2); $form->number('sort')->width(2)->default(0); $form->hidden('type')->value(2)->default(2); }); diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index bb23ae7..e641621 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -116,7 +116,7 @@ class ServicePersonnelController extends AdminController $form->hidden('id'); $form->text('name')->required(); $form->text('tel')->required(); - $form->image('head_url'); + $form->image('head_url')->autoUpload(); }); $form->column(6,function(Form $form) use($marketList,$userList){ $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 6ed6431..848ffd0 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -187,7 +187,7 @@ class StoreController extends AdminController $form->select('market_id')->required()->options($marketList); $form->select('category_id')->options($categoryList); $form->text('name')->required()->maxLength(50); - $form->image('logo')->required()->uniqueName(); + $form->image('logo')->autoUpload()->required(); $form->mobile('tel'); $form->text('link_name')->required(); $form->mobile('link_tel')->required(); @@ -209,9 +209,9 @@ class StoreController extends AdminController $form->text('address')->required(); }); $form->column(6, function (Form $form) { - $form->image('business_license')->required()->uniqueName(); - $form->image('zm_img')->required()->uniqueName(); - $form->image('fm_img')->required()->uniqueName(); + $form->image('business_license')->autoUpload()->required(); + $form->image('zm_img')->autoUpload()->required(); + $form->image('fm_img')->autoUpload()->required(); // $form->select('admin_id')->options($userList)->required(); // $form->select('user_id')->options($userList)->required(); $form->number('admin_id')->required()->min(0); @@ -226,8 +226,8 @@ class StoreController extends AdminController $form->column(12, function (Form $form) { $form->map('lat','lng','地址'); $form->textarea('introduction')->required(); - $form->textarea('announcement'); - $form->multipleImage('environment'); + $form->textarea('announcement')->default(''); + $form->multipleImage('environment')->autoUpload()->default(''); }); // $form->text('coordinates')->width(4) @@ -235,13 +235,20 @@ class StoreController extends AdminController // ->help("通过网址 https://lbs.amap.com/console/show/picker 获取经纬度"); $form->saving(function(Form $form){ $id = $form->getKey(); - $adminId = $form->input('admin_id'); - $store = StoreModel::select('id')->where([ - ['admin_id','=',$adminId], - ['id','<>',$id?$id:0], - ])->first(); - if(!empty($store)){ - return $form->error('管理员已经绑定了店铺'); + $adminId = $form->input('admin_id'); + if(!empty($id) && !empty($adminId)){ + $user = UserModel::getUserInfo($adminId,'id'); + if(empty($user)){ + return $form->error('管理员不存在'); + } + $store = StoreModel::select('id')->where([ + ['admin_id','=',$adminId], + ['id','<>',$id?$id:0], + ])->first(); + + if(!empty($store)){ + return $form->error('管理员已经绑定了店铺'); + } } }); $form->saved(function (Form $form){ From 01bf2fefdfd6507464c3b21c77e09aa5e4546682 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Tue, 15 Sep 2020 20:24:56 +0800 Subject: [PATCH 31/56] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ImsCjdcOrderMainController.php | 1 + app/Admin/Extensions/MyDetailPage.php | 2 +- app/Models/ImsCjdcOrderMain.php | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index 32025ef..7e5ab6d 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -81,6 +81,7 @@ class ImsCjdcOrderMainController extends AdminController $grid->disableViewButton(); $grid->disableEditButton(); $grid->disableDeleteButton(); + $grid->disableCreateButton(); }); } diff --git a/app/Admin/Extensions/MyDetailPage.php b/app/Admin/Extensions/MyDetailPage.php index 3508e61..e177df0 100644 --- a/app/Admin/Extensions/MyDetailPage.php +++ b/app/Admin/Extensions/MyDetailPage.php @@ -55,7 +55,7 @@ class MyDetailPage extends LazyRenderable coupon_money: "{$order['coupon_money']}", delivery_money: "{$order['delivery_money']}", horseman_name: "{$order['horseman_name']}", - distance: "{$order['distance']}", + distance: "{$order['delivery_distance']}", orders: JSON.parse(orders), show_refund: JSON.parse(show_refund), refund_2:"退款", diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php index 25849cc..7976d06 100644 --- a/app/Models/ImsCjdcOrderMain.php +++ b/app/Models/ImsCjdcOrderMain.php @@ -62,12 +62,12 @@ class ImsCjdcOrderMain extends Model $order['horseman_name'] = LanzuServiceHorseman::getName($order['horseman_id']); //获取市场经纬度 - $market = LanzuMarket::where('id',$order['market_id'])->first()->toArray(); - $order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result']; - if ($order['distance']>1000){ - $order['distance']= number_format(($order['distance']/1000), 1) .'km'; + //$market = LanzuMarket::where('id',$order['market_id'])->first()->toArray(); + //$order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result']; + if ($order['delivery_distance']>1000){ + $order['delivery_distance']= number_format(($order['delivery_distance']/1000), 1) .'km'; }else{ - $order['distance'].= '米'; + $order['delivery_distance'].= '米'; } return $order; } From e52fcfc1fea2da434bf461aadbc870de239fc7fd Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 09:35:16 +0800 Subject: [PATCH 32/56] =?UTF-8?q?=E6=87=92=E6=97=8F=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=8C=E4=BD=8D=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/LanzuEmployeesController.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index 6a5e230..b4f8d0e 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -29,13 +29,10 @@ class LanzuEmployeesController extends AdminController $grid->column('id')->sortable(); $grid->column('name'); + $grid->column('user_id'); $grid->column('market_id')->display(function($marketId) use($marketList){ return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; }); - // $grid->column('user_id')->display(function($userId){ - // $item = UserModel::getUserInfo($userId,'real_name'); - // return empty($item) ? '' : $item->real_name; - // }); $grid->column('store_id')->display(function($storeId){ $item = StoreModel::getStoreInfo($storeId,'name'); return empty($item) ? '' : $item->name; @@ -55,7 +52,7 @@ class LanzuEmployeesController extends AdminController $grid->filter(function (Grid\Filter $filter) use($marketList,$positionList){ $filter->equal('id'); $filter->equal('market_id')->select($marketList); - $filter->equal('position')->select($positionList); + $filter->like('position')->select($positionList); }); $grid->model()->orderBy('status','desc'); $grid->model()->orderBy('id','desc'); From 9d59db4cff9c11f6c5208258c3640ca338c61ac7 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 10:01:44 +0800 Subject: [PATCH 33/56] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Auth.php | 4 +- app/Admin/Common/Type.php | 43 +++++++++++++++++++ .../Controllers/LanzuCsInfoController.php | 4 +- .../Controllers/LanzuCsWithdrawController.php | 19 ++++---- .../Controllers/LanzuMmInfoController.php | 1 + .../Controllers/LanzuMmWithdrawController.php | 8 +--- .../Controllers/LanzuMpInfoController.php | 1 + .../Controllers/LanzuMpWithdrawController.php | 3 +- app/Admin/Controllers/Type.php | 40 ----------------- 9 files changed, 62 insertions(+), 61 deletions(-) create mode 100644 app/Admin/Common/Type.php delete mode 100644 app/Admin/Controllers/Type.php diff --git a/app/Admin/Common/Auth.php b/app/Admin/Common/Auth.php index 699a1d3..2da690c 100644 --- a/app/Admin/Common/Auth.php +++ b/app/Admin/Common/Auth.php @@ -24,10 +24,10 @@ class Auth extends AdminController public static function addAdminUser($form, $model, $cid, $roles,$type=0) { $adu = new AdminUsers(); - if (!$id) { + if (!$cid) { return '-2'; } - $row = $model::find($id); + $row = $model::find($cid); //>>1.添加前,去查询是否已存在相同的帐号 $count = $adu->where(['username' => $form->phone])->count(); diff --git a/app/Admin/Common/Type.php b/app/Admin/Common/Type.php new file mode 100644 index 0000000..2580278 --- /dev/null +++ b/app/Admin/Common/Type.php @@ -0,0 +1,43 @@ +=100是提现消费等支出项 + */ + const MONEY_TYPE_CS_PLAT_NEW_USER = 1; // 社区服务点新用户奖励（线上订单完成） + const MONEY_TYPE_CS_FIRST_ORDER = 2; // 社区服务点新用户线上首单奖励（线上订单完成） + const MONEY_TYPE_CS_OL_ORDER = 3; // 社区服务点用户线上订单分账（线上订单完成） + const MONEY_TYPE_STORE_PLAT_NEW_USER = 4; // 商户平台新用户奖励 + const MONEY_TYPE_STORE_FIRST_ORDER = 5; // 商户当日首单奖励 + const MONEY_TYPE_STORE_OL_ORDER_COMP = 6; // 商户线上订单完成收入 + const MONEY_TYPE_STORE_OFL_ORDER_COMP = 7; // 商户线下订单完成收入 + const MONEY_TYPE_USER_OL_ORDER_REFUND = 8; // 用户线上订单退款 + const MONEY_TYPE_MM_PLAT_NEW_USER = 9; // 市场经理发展新用户 + const MONEY_TYPE_MM_PLAT_NEW_STORE = 10; // 市场经理发展新商户 + const MONEY_TYPE_MP_PLAT_NEW_USER = 11; // 服务商发展新用户 + const MONEY_TYPE_MP_PLAT_NEW_STORE = 12; // 服务商发展新商户 + const MONEY_TYPE_MP_OL_ORDER = 13; // 服务商线上订单分账（线上订单完成） + + const MONEY_TYPE_USER_OFL_ORDER = 100; // 用户线下支付订单 + const MONEY_TYPE_USER_OL_ORDER = 101; // 用户线上支付订单 + const MONEY_TYPE_MP = 102; //市场经理提现类型 + const MONEY_TYPE_MM = 103; //市场经理提现类型 + const MONEY_TYPE_CS = 104; //社区提现类型 + + /** + * lanzu_user_balance 提现类型 + */ + const BALANCE_USER_TYPE_U = 1; //用户提现类型 + const BALANCE_USER_TYPE_MP = 2; //服务商提现类型 + const BALANCE_USER_TYPE_MM = 3; //市场经理提现类型 + const BALANCE_USER_TYPE_CS = 4; //社区提现类型 + const BALANCE_USER_TYPE_STORE = 5; //商户提现类型 + + + +} diff --git a/app/Admin/Controllers/LanzuCsInfoController.php b/app/Admin/Controllers/LanzuCsInfoController.php index 89e7eba..33fdc95 100644 --- a/app/Admin/Controllers/LanzuCsInfoController.php +++ b/app/Admin/Controllers/LanzuCsInfoController.php @@ -4,6 +4,7 @@ namespace App\Admin\Controllers; use App\Admin\Common\Auth; use App\Admin\Common\Images; +use App\Admin\Common\Type; use App\Admin\Repositories\LanzuCsInfo; use App\Models\AdminUsers; @@ -19,7 +20,6 @@ use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use \App\Models\LanzuCsInfo as modelCsInfo; -use Illuminate\Support\Facades\DB; use function foo\func; class LanzuCsInfoController extends AdminController @@ -121,7 +121,7 @@ class LanzuCsInfoController extends AdminController $model = new modelCsInfo(); if ($form->isCreating()) { //>>1.添加登录帐号 - $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',4); + $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',Type::BALANCE_USER_TYPE_CS); if ($res == -1) { return $form->error('该手机号作为登陆帐号已存在!'); } elseif ($res == -2) { diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php index 4aad2b3..cfb7bda 100644 --- a/app/Admin/Controllers/LanzuCsWithdrawController.php +++ b/app/Admin/Controllers/LanzuCsWithdrawController.php @@ -5,15 +5,14 @@ namespace App\Admin\Controllers; use App\Admin\Common\WxPay; use App\Admin\Repositories\LanzuCsWithdraw; use App\Models\FinancialRecord; -use App\Models\FinancialRecord0; use App\Models\ImsCjdcUser; use App\Models\LanzuCsInfo; use App\Models\LanzuUserBalance; -use app\Request; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; +use App\Admin\Common\Type; use Dcat\Admin\Controllers\AdminController; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; @@ -93,7 +92,7 @@ class LanzuCsWithdrawController extends AdminController if ($user->isRole('lanzu_cs')) {//如果是社区站点角色 $cs = LanzuCsInfo::where('admin_user_id', $user->id)->first(); if ($cs) { - $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, 3))->disable(); + $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, ))->disable(); $form->hidden('cs_id', '提现用户id')->value($cs->id); $form->text('csInfo.name', '提现用户')->value($cs->name)->disable(); $form->number('money')->min(env('MIN_MONEY'))->max(env('MAX_MONEY')); @@ -113,13 +112,13 @@ class LanzuCsWithdrawController extends AdminController } $form->saved(function () use ($cs, $form) {//扣减提现金额 - LanzuUserBalance::reduceBalance($cs->admin_user_id, 3, $form->money); + LanzuUserBalance::reduceBalance($cs->admin_user_id, Type::BALANCE_USER_TYPE_CS, $form->money); }); } else {//编辑操作 $aduid = LanzuCsInfo::where('id', $form->model()->cs_id)->pluck('admin_user_id')->first(); - $form->display('amount', '可提现金额')->value(LanzuUserBalance::getBalance($aduid, 3)); + $form->display('amount', '可提现金额')->value(LanzuUserBalance::getBalance($aduid, Type::BALANCE_USER_TYPE_CS)); $form->display('cs_id', '提现用户')->value($form->model()->name); $form->display('money'); @@ -139,7 +138,7 @@ class LanzuCsWithdrawController extends AdminController $form->saved(function (Form $form) use ($aduid) { if ($form->status == -1) {//如何审核被拒绝,退回提现金额 - LanzuUserBalance::returnBalance($aduid, 3, $form->model()->money); + LanzuUserBalance::returnBalance($aduid, Type::BALANCE_USER_TYPE_CS, $form->model()->money); } elseif ($form->status == 1) {//调用微信企业付 //获取站点信息 $csInfo = LanzuCsInfo::find($form->model()->cs_id); @@ -164,9 +163,9 @@ class LanzuCsWithdrawController extends AdminController //添加流水记录 $model = FinancialRecord::getFinancialRecordModel($csInfo->admin_user_id); $model->user_id = $csInfo->admin_user_id; - $model->user_type = 4; + $model->user_type = Type::BALANCE_USER_TYPE_CS; $model->money = $form->model()->money; - $model->money_type = 104; + $model->money_type = Type::MONEY_TYPE_CS; $model->desc = '社区站点提现'; $model->comment = '社区站点提现'; $model->save(); @@ -176,7 +175,7 @@ class LanzuCsWithdrawController extends AdminController $model->user_id = -1; $model->user_type = -1; $model->money = $form->model()->money; - $model->money_type = 104; + $model->money_type = Type::MONEY_TYPE_CS; $model->desc = '社区站点提现'; $model->comment = '社区站点提现'; $model->save(); @@ -186,7 +185,7 @@ class LanzuCsWithdrawController extends AdminController } else { DB::transaction(function () use ($aduid, $form) { //提现失败,退回提现金额 - LanzuUserBalance::returnBalance($aduid, 3, $form->model()->money); + LanzuUserBalance::returnBalance($aduid, Type::BALANCE_USER_TYPE_CS, $form->model()->money); //更改提现状态为-2 提现失败 \App\Models\LanzuCsWithdraw::updateStatus($form->model()->id, -2); diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 5725126..32c4c5c 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Common\Auth; +use App\Admin\Common\Type; use App\Admin\Repositories\LanzuMmInfo; use App\Models\AdminUsers; use \App\Models\AdminRoles; diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index 6c0caac..e25a708 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Common\FinancialRecord; +use App\Admin\Common\Type; use App\Admin\Repositories\LanzuMmWithdraw; use App\Models\ImsCjdcUser; use App\Models\LanzuMmWithdraw as MmWithdraw; @@ -187,7 +188,7 @@ class LanzuMmWithdrawController extends AdminController //添加流水记录 $adminUserId = $mm->admin_user_id; $money = $form->model()->money; - FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, 103, '市场经理提现', '市场经理提现'); + FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, Type::MONEY_TYPE_MM, '市场经理提现', '市场经理提现'); } else { //如果提现失败,返回提现金额 MpBalance::returnBalance($mm->admin_user_id, Type::BALANCE_USER_TYPE_MM, $form->model()->money); @@ -303,9 +304,4 @@ class LanzuMmWithdrawController extends AdminController } - public function mmInfoList() - { - echo 11; - } - } diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index fb18e09..8e8bf90 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Common\Auth; +use App\Admin\Common\Type; use App\Admin\Extensions\CheckRow; use App\Admin\Metrics\Examples\TotalUsers; use App\Admin\Repositories\LanzuMpInfo; diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 50fddd3..7c88e58 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -4,6 +4,7 @@ namespace App\Admin\Controllers; use App\Admin\Common\FinancialRecord; use App\Admin\Common\Sms; +use App\Admin\Common\Type; use App\Admin\Repositories\LanzuMpWithdraw; use App\Models\ImsCjdcMarket; use App\Models\LanzuMpWithdraw as modelMpInfo; @@ -164,7 +165,7 @@ class LanzuMpWithdrawController extends AdminController MpBalance::returnBalance($adminUserId, Type::BALANCE_USER_TYPE_MP, $money); } elseif ($form->status == 1) { //如果审核通过,则记录流水 - FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, 102, '服务商提现', '服务商提现'); + FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, Type::MONEY_TYPE_MP, '服务商提现', '服务商提现'); } } }); diff --git a/app/Admin/Controllers/Type.php b/app/Admin/Controllers/Type.php deleted file mode 100644 index bdb83cf..0000000 --- a/app/Admin/Controllers/Type.php +++ /dev/null @@ -1,40 +0,0 @@ -=100是提现消费等支出项 - */ - const MONEY_TYPE_CS_PLAT_NEW_USER = 1; // 社区服务点新用户奖励（线上订单完成） - const MONEY_TYPE_CS_FIRST_ORDER = 2; // 社区服务点新用户线上首单奖励（线上订单完成） - const MONEY_TYPE_CS_OL_ORDER = 3; // 社区服务点用户线上订单分账（线上订单完成） - const MONEY_TYPE_STORE_PLAT_NEW_USER = 4; // 商户平台新用户奖励 - const MONEY_TYPE_STORE_FIRST_ORDER = 5; // 商户当日首单奖励 - const MONEY_TYPE_STORE_OL_ORDER_COMP = 6; // 商户线上订单完成收入 - const MONEY_TYPE_STORE_OFL_ORDER_COMP = 7; // 商户线下订单完成收入 - const MONEY_TYPE_USER_OL_ORDER_REFUND = 8; // 用户线上订单退款 - const MONEY_TYPE_MM_PLAT_NEW_USER = 9; // 市场经理发展新用户 - const MONEY_TYPE_MM_PLAT_NEW_STORE = 10; // 市场经理发展新商户 - const MONEY_TYPE_MP_PLAT_NEW_USER = 11; // 服务商发展新用户 - const MONEY_TYPE_MP_PLAT_NEW_STORE = 12; // 服务商发展新商户 - const MONEY_TYPE_MP_OL_ORDER = 13; // 服务商线上订单分账（线上订单完成） - - const MONEY_TYPE_USER_OFL_ORDER = 100; // 用户线下支付订单 - const MONEY_TYPE_USER_OL_ORDER = 101; // 用户线上支付订单 - - - /** - * lanzu_user_balance 提现类型 - */ - const BALANCE_USER_TYPE_U = 1; //用户提现类型 - const BALANCE_USER_TYPE_MP = 2; //服务商提现类型 - const BALANCE_USER_TYPE_MM = 3; //市场经理提现类型 - const BALANCE_USER_TYPE_CS = 4; //社区提现类型 - const BALANCE_USER_TYPE_STORE= 5; //商户提现类型 - - -} From d6effbe958a1e4c6d257cb982fadfa9ab9ca29cb Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 10:08:10 +0800 Subject: [PATCH 34/56] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95RPC?= =?UTF-8?q?=20=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Rpc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index 9df0fe3..3d0d46a 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -10,8 +10,8 @@ class Rpc { const SEPARATE_ACCOUNTS = "/order/onlineComplete";//订单完成 - const ORDER_REFUND = "/order/onlineRefund";//整笔订单退款 - const ORDER_SINGLE_REFUND = "/order/onlineSingleRefund";//订单单个商品退款 + const ORDER_REFUND = "/orderonline/onlineRefund";//整笔订单退款 + const ORDER_SINGLE_REFUND = "/orderonline/onlineSingleRefund";//订单单个商品退款 const GET_DISTANCE = "/location/getDistanceByTencent";//获取骑行距离 const DO_BY_ORDER = "/badge/doByOrder";//订单状态变更 const ALI_SMS_SENT = "/alisms/sent";//发短信 From c180ee816a5eb2b64efc8298d850cbb16ae97744 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 10:47:17 +0800 Subject: [PATCH 35/56] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95RPC?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Common/Rpc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index 3d0d46a..e53655b 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -9,9 +9,9 @@ use Graze\GuzzleHttp\JsonRpc\Client; class Rpc { - const SEPARATE_ACCOUNTS = "/order/onlineComplete";//订单完成 - const ORDER_REFUND = "/orderonline/onlineRefund";//整笔订单退款 - const ORDER_SINGLE_REFUND = "/orderonline/onlineSingleRefund";//订单单个商品退款 + const SEPARATE_ACCOUNTS = "/orders/onlineComplete";//订单完成 + const ORDER_REFUND = "/orders/onlineRefund";//整笔订单退款 + const ORDER_SINGLE_REFUND = "/orders/onlineSingleRefund";//订单单个商品退款 const GET_DISTANCE = "/location/getDistanceByTencent";//获取骑行距离 const DO_BY_ORDER = "/badge/doByOrder";//订单状态变更 const ALI_SMS_SENT = "/alisms/sent";//发短信 From 6206979be11dfab662994792ab79f15577afbbf2 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 10:47:21 +0800 Subject: [PATCH 36/56] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=B4=97=E5=95=86?= =?UTF-8?q?=E5=93=81--=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA=20=E6=9C=8D=E5=8A=A1=E7=AB=99?= =?UTF-8?q?=E4=B8=93=E5=91=98--=E7=94=A8=E6=88=B7=E6=87=92ID=E8=BE=93?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/GoodsNewController.php | 12 ++++++ .../v3/ServicePersonnelController.php | 38 ++++++++++++++----- app/Admin/Controllers/v3/UserController.php | 6 ++- app/Console/Commands/MigrateGoods.php | 2 +- resources/lang/zh-CN/service-personnel.php | 2 +- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 5d87537..e143e88 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -41,6 +41,16 @@ class GoodsNewController extends AdminController $grid->name->editable(); $grid->price->editable(); $grid->column('goods_unit','单位')->editable(); + $grid->column('spec','规格')->display(function($spec){ + $item = ''; + if(!empty($spec)){ + foreach($spec as $key => $value){ + $item .= $value['spec_key'].'：'.$value['spec_value'].'
'; + } + } + + return $item; + }); $grid->column('market_id')->display(function($marketId){ $item = MarketModel::getMarketInfo($marketId,'name'); return empty($item) ? '' : $item->name; @@ -66,12 +76,14 @@ class GoodsNewController extends AdminController $grid->actions([new GoodsNewCopy(),new GoodsNewImage()]); $grid->filter(function (Grid\Filter $filter) use($storeList, $categoryList, $goodsCategoryList, $marketList){ + $filter->equal('id'); $filter->like('name'); $filter->equal('store_id')->select($storeList); $filter->equal('category_id')->select($categoryList); $filter->equal('goods_category_id')->select($goodsCategoryList); $filter->equal('market_id')->select($marketList); $filter->equal('on_sale')->select(GoodsModel::$_ONSALE); + $filter->equal('price'); }); $grid->model()->orderBy('category_id', 'asc'); diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index e641621..2f0f81f 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -103,14 +103,14 @@ class ServicePersonnelController extends AdminController //市场 $marketList = MarketModel::getMarketArray(); // 用户 - $userList = UserModel::getUserArray(); + // $userList = UserModel::getUserArray(); // 已绑定的用户 - $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); - foreach($userList as $ku => $uv){ - if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ - unset($userList[$ku]); - } - } + // $userHas = ServicePersonnelModel::pluck('user_id')->toArray(); + // foreach($userList as $ku => $uv){ + // if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){ + // unset($userList[$ku]); + // } + // } $form->column(6,function(Form $form){ $form->hidden('id'); @@ -118,15 +118,33 @@ class ServicePersonnelController extends AdminController $form->text('tel')->required(); $form->image('head_url')->autoUpload(); }); - $form->column(6,function(Form $form) use($marketList,$userList){ + $form->column(6,function(Form $form) use($marketList){ $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); $form->select('market_id')->options($marketList)->required(); - $form->select('user_id')->options($userList)->required(); + // $form->select('user_id')->options($userList)->required(); + $form->number('user_id')->required()->min(0); $statusList = ServicePersonnelModel::$_STATUS; unset($statusList[0],$statusList[2]); $form->radio('status')->options($statusList)->default(1); }); - + + $form->saving(function(Form $form){ + $id = $form->getKey(); + $userId = $form->input('user_id'); + if(!empty($id) && !empty($userId)){ + $user = UserModel::getUserInfo($userId,'id'); + if(empty($user)){ + return $form->error('懒ID不存在'); + } + $store = ServicePersonnelModel::select('id')->where([ + ['user_id','=',$userId], + ['id','<>',$id?$id:0], + ])->first(); + if(!empty($store)){ + return $form->error('用户已经为服务专员'); + } + } + }); $form->saved(function(Form $form){ $id = $form->getKey(); diff --git a/app/Admin/Controllers/v3/UserController.php b/app/Admin/Controllers/v3/UserController.php index ecdfb1c..837b0a6 100644 --- a/app/Admin/Controllers/v3/UserController.php +++ b/app/Admin/Controllers/v3/UserController.php @@ -60,12 +60,14 @@ class UserController extends AdminController $show->field('real_name'); $show->field('tel'); $show->field('unionid'); - $show->field('status'); + $show->field('country'); $show->field('province'); $show->field('city'); - $show->field('gender'); + $show->field('gender_text'); $show->field('language'); + + $show->field('status_text'); $show->field('created_at'); $show->field('updated_at'); diff --git a/app/Console/Commands/MigrateGoods.php b/app/Console/Commands/MigrateGoods.php index 1289cf6..1f125c7 100644 --- a/app/Console/Commands/MigrateGoods.php +++ b/app/Console/Commands/MigrateGoods.php @@ -89,7 +89,7 @@ class MigrateGoods extends Command 'on_sale'=> $value->is_show == 1 ? 1 : 0, 'sort'=>$value->num, 'price'=>$value->money, - 'original_price'=>$value->money2, + 'original_price'=> ($value->money2 < $value->money)?$value->money:$value->money2, 'vip_price'=>$value->vip_money, 'sales'=>$value->sales, 'start_num'=>$value->start_num, diff --git a/resources/lang/zh-CN/service-personnel.php b/resources/lang/zh-CN/service-personnel.php index 04d05a2..015c00e 100644 --- a/resources/lang/zh-CN/service-personnel.php +++ b/resources/lang/zh-CN/service-personnel.php @@ -6,7 +6,7 @@ return [ 'service_personnel' => '服务站专员', ], 'fields' => [ - 'user_id' => '服务员懒ID', + 'user_id' => '服务专员懒ID', 'name' => '姓名', 'tel' => '电话', 'market_id' => '所属市场', From 915af1b284020bfae21292839fc2921afbb9936d Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 11:24:11 +0800 Subject: [PATCH 37/56] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20firstCreate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuCsInfoController.php | 5 ++++- app/Models/LanzuUserBalance.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Admin/Controllers/LanzuCsInfoController.php b/app/Admin/Controllers/LanzuCsInfoController.php index 33fdc95..a50ed58 100644 --- a/app/Admin/Controllers/LanzuCsInfoController.php +++ b/app/Admin/Controllers/LanzuCsInfoController.php @@ -49,7 +49,10 @@ class LanzuCsInfoController extends AdminController return LanzuUserRelationBind::getCount($this->admin_user_id); }); $grid->column('balance', '可提现金额')->display(function (){ - $balance = LanzuUserBalance::where('source_id',$this->admin_user_id)->where('user_type',4)->first(); + $balance = LanzuUserBalance::firstOrCreate( + ['source_id'=>$this->admin_user_id,'user_type'=>Type::BALANCE_USER_TYPE_CS], + ['balance'=>0] + ); return $balance->balance; }); $grid->column('qrcode_path', '二维码')->image('', 50, 50); diff --git a/app/Models/LanzuUserBalance.php b/app/Models/LanzuUserBalance.php index bd585be..fb46939 100644 --- a/app/Models/LanzuUserBalance.php +++ b/app/Models/LanzuUserBalance.php @@ -10,7 +10,7 @@ class LanzuUserBalance extends Model { protected $table = 'lanzu_user_balance'; protected $dateFormat = 'U'; - + protected $guarded = []; /** * 获取可提现金额 * @param $uid From f89503d920e3be123a7d164654a2cf2549147016 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 11:30:01 +0800 Subject: [PATCH 38/56] =?UTF-8?q?=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=8F=AA=E5=A1=AB=E5=86=99=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=98=BE=E7=A4=BA=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/GoodsController.php | 8 +++++--- app/Admin/Controllers/v3/GoodsNewController.php | 13 +++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 6832a97..c10ccd7 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -111,7 +111,9 @@ class GoodsController extends AdminController $text = ''; if($value){ foreach ($value as $v){ - $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】 '; + $specKey = isset($v['spec_key'])?$v['spec_key']:''; + $specValue = isset($v['spec_value'])?$v['spec_value']:''; + $text .= '【'.$specKey .'：'.$specValue.'】 '; } } return $text; @@ -198,8 +200,8 @@ class GoodsController extends AdminController $form->tags('tags','标签')->options(['新品','热销','新鲜']); $form->table('spec', function (NestedForm $table) { - $table->text('spec_key')->help('如：净含量：500克，保质期：120天，包装：12个/盒等'); - $table->text('spec_value'); + $table->text('spec_key')->required()->help('如：净含量：500克，保质期：120天，包装：12个/盒等'); + $table->text('spec_value')->required(); }); $form->switch('on_sale') ->customFormat(function ($v) { diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index e143e88..8eb48c1 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -45,7 +45,9 @@ class GoodsNewController extends AdminController $item = ''; if(!empty($spec)){ foreach($spec as $key => $value){ - $item .= $value['spec_key'].'：'.$value['spec_value'].'
'; + $specKey = isset($value['spec_key'])?$value['spec_key']:''; + $specValue = isset($value['spec_value'])?$value['spec_value']:''; + $item .= $specKey.'：'.$specValue.'
'; } } @@ -84,6 +86,7 @@ class GoodsNewController extends AdminController $filter->equal('market_id')->select($marketList); $filter->equal('on_sale')->select(GoodsModel::$_ONSALE); $filter->equal('price'); + $filter->equal('goods_unit'); }); $grid->model()->orderBy('category_id', 'asc'); @@ -142,7 +145,9 @@ class GoodsNewController extends AdminController $text = ''; if($value){ foreach ($value as $v){ - $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】 '; + $specKey = isset($v['spec_key'])?$v['spec_key']:''; + $specValue = isset($v['spec_value'])?$v['spec_value']:''; + $text .= '【'.$specKey .'：'.$specValue.'】 '; } } return $text; @@ -229,8 +234,8 @@ class GoodsNewController extends AdminController $form->tags('tags','标签')->options(['新品','热销','新鲜']); $form->table('spec', function (NestedForm $table) { - $table->text('spec_key')->help('如：净含量：500克，保质期：120天，包装：12个/盒等'); - $table->text('spec_value'); + $table->text('spec_key')->required()->help('如：净含量：500克，保质期：120天，包装：12个/盒等'); + $table->text('spec_value')->required(); }); $form->switch('on_sale') ->customFormat(function ($v) { From d41f9f8a282f6d8ff1486caaf8c3b81a761aa19e Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 11:46:16 +0800 Subject: [PATCH 39/56] firstCreate --- app/Models/MpBalance.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Models/MpBalance.php b/app/Models/MpBalance.php index 75acafe..55981ad 100644 --- a/app/Models/MpBalance.php +++ b/app/Models/MpBalance.php @@ -10,6 +10,7 @@ class MpBalance extends Model { protected $table = 'lanzu_user_balance'; protected $dateFormat = 'U'; + protected $guarded = []; /** * 获取可提现金额 @@ -18,7 +19,10 @@ class MpBalance extends Model */ public static function getBalance($uid,$uType=0) { - $row = self::where(['source_id'=>$uid,'user_type'=>$uType])->first(); + $row = self::where(['source_id'=>$uid,'user_type'=>$uType])->firstOrCreate( + ['source_id'=>$uid,'user_type'=>$uType], + ['balance'=>0] + ); if ($row){ return $row->balance; }else{ From 2ed762b7d87711bfdf6e0d3feb6a27f72b867835 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 14:02:44 +0800 Subject: [PATCH 40/56] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/HomeController.php | 1 + composer.lock | 27 +++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index a19428b..1eeef89 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -2,6 +2,7 @@ namespace App\Admin\Controllers; +use App\Admin\Common\Type; use App\Admin\Metrics\Examples; use App\Http\Controllers\Controller; use App\Models\LanzuMpInfo; diff --git a/composer.lock b/composer.lock index 3ad03e9..838f3b3 100644 --- a/composer.lock +++ b/composer.lock @@ -1903,16 +1903,16 @@ }, { "name": "laravel/framework", - "version": "v7.28.1", + "version": "v7.28.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8" + "reference": "0956b0688d96565044074b77f521a653d9fce5fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8", - "reference": "f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8", + "url": "https://api.github.com/repos/laravel/framework/zipball/0956b0688d96565044074b77f521a653d9fce5fb", + "reference": "0956b0688d96565044074b77f521a653d9fce5fb", "shasum": "", "mirrors": [ { @@ -2063,7 +2063,7 @@ "framework", "laravel" ], - "time": "2020-09-09T15:02:46+00:00" + "time": "2020-09-15T14:48:02+00:00" }, { "name": "laravel/scout", @@ -3920,16 +3920,16 @@ }, { "name": "spatie/eloquent-sortable", - "version": "3.8.3", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/spatie/eloquent-sortable.git", - "reference": "7087d3050b19f29348faead5385eddee50d4c3b5" + "reference": "51bca09f0c49ac2da8cd480e1e667ddcfce5a3f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/7087d3050b19f29348faead5385eddee50d4c3b5", - "reference": "7087d3050b19f29348faead5385eddee50d4c3b5", + "url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/51bca09f0c49ac2da8cd480e1e667ddcfce5a3f2", + "reference": "51bca09f0c49ac2da8cd480e1e667ddcfce5a3f2", "shasum": "", "mirrors": [ { @@ -3949,6 +3949,13 @@ "phpunit/phpunit": "^8.0|^9.0" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\EloquentSortable\\EloquentSortableServiceProvider" + ] + } + }, "autoload": { "psr-4": { "Spatie\\EloquentSortable\\": "src/" @@ -3974,7 +3981,7 @@ "sort", "sortable" ], - "time": "2020-09-08T18:12:01+00:00" + "time": "2020-09-15T06:48:07+00:00" }, { "name": "swiftmailer/swiftmailer", From 483fec63037dd8daea81b60113e76e8a38d68bfb Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 14:45:24 +0800 Subject: [PATCH 41/56] =?UTF-8?q?=E6=87=92=E6=97=8F=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E8=AF=9D=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/LanzuEmployeesController.php | 5 ++++- app/Admin/Controllers/v3/ServicePersonnelController.php | 2 +- resources/lang/zh-CN/lanzu-employees.php | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index b4f8d0e..57db797 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -29,6 +29,7 @@ class LanzuEmployeesController extends AdminController $grid->column('id')->sortable(); $grid->column('name'); + $grid->column('tel'); $grid->column('user_id'); $grid->column('market_id')->display(function($marketId) use($marketList){ return isset($marketList[$marketId]) ? $marketList[$marketId] : ''; @@ -73,6 +74,7 @@ class LanzuEmployeesController extends AdminController return Show::make($id, new LanzuEmployees(), function (Show $show) { $show->field('id'); $show->field('name'); + $show->field('tel'); $show->field('user_id'); $show->field('store_id')->as(function($storeId){ $item = StoreModel::getStoreInfo($storeId,'name'); @@ -124,7 +126,8 @@ class LanzuEmployeesController extends AdminController $form->hidden('id'); $form->number('user_id')->required()->min(0); // $form->select('user_id')->required()->options($userList); - $form->text('name','真实姓名')->width(4)->required(); + $form->text('name','真实姓名')->width(2)->required(); + $form->mobile('tel')->width(4)->required(); $form->select('market_id')->required()->options($marketList); $form->multipleSelect('position')->required()->options(config('role.position')); $form->select('store_id')->options($storeList); diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 2f0f81f..5dbbac7 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -115,7 +115,7 @@ class ServicePersonnelController extends AdminController $form->column(6,function(Form $form){ $form->hidden('id'); $form->text('name')->required(); - $form->text('tel')->required(); + $form->mobile('tel')->required(); $form->image('head_url')->autoUpload(); }); $form->column(6,function(Form $form) use($marketList){ diff --git a/resources/lang/zh-CN/lanzu-employees.php b/resources/lang/zh-CN/lanzu-employees.php index 6420fab..9243d6a 100644 --- a/resources/lang/zh-CN/lanzu-employees.php +++ b/resources/lang/zh-CN/lanzu-employees.php @@ -10,6 +10,7 @@ return [ 'user_id' => '用户懒ID', 'store_id' => '店铺', 'name' => '姓名', + 'tel' => '电话', 'market_id' => '服务站', 'position' => '职位', 'status' => '状态', From 95615225ef4a6832cd56b2e9d1ebbc43e7955960 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 14:46:54 +0800 Subject: [PATCH 42/56] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=A1=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/HomeController.php | 4 +- .../Examples/ServiceCard/TotalStore.php | 94 ++++++++++++++++--- 2 files changed, 84 insertions(+), 14 deletions(-) diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index 1eeef89..6922a72 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -68,8 +68,8 @@ class HomeController extends Controller $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MP)); }); - $row->column(3, function (Column $column) { - $column->row(new Examples\ServiceCard\TotalStore()); + $row->column(3, function (Column $column)use ($marketIds) { + $column->row(new Examples\ServiceCard\TotalStore($marketIds,'商户数')); }); $row->column(3, function (Column $column)use ($marketIds) { $column->row(new Examples\Order\OrderData('number',$marketIds,'订单数')); diff --git a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php index 09f7225..d4eb5ab 100644 --- a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php +++ b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php @@ -9,29 +9,99 @@ use App\Models\LanzuMmInfo; use App\Models\LanzuStore; use Dcat\Admin\Admin; use Dcat\Admin\Widgets\Metrics\Card; +use Illuminate\Http\Request; class TotalStore extends Card { + protected $title; + protected $market_id; + public function __construct($market_id=null,$title = null, $icon = null) + { + $this->title = $title; + $this->market_id = $market_id; + parent::__construct($title, $icon); + } protected function init() { parent::init(); - $this->title = '商户数'; - $aud = Admin::user(); - $count = 0; - if ($aud->isRole('lanzu_mm')){ - $mm = LanzuMmInfo::where('admin_user_id',$aud->id)->first(); - if ($mm){ - $count = ImsCjdcStore::where('mm_user_id',$mm->user_id)->count(); + $this->dropdown([ + '0'=>'全部', + '1'=>'今日新增', + '-1'=>'昨日新增', + '7'=>'过去一周新增', + '30'=>'本月新增', + '-30'=>'上月新增' + ]); + } + + public function handle(Request $request) + { + $type = $request->get('option');//数据选项 + $market_id = $request->get('market_id');//市场id + $this->content($this->storeNum($type,$market_id)); + } + + public function storeBuild($type=null,$marketId=null) + { + $where = ['status'=>2]; + if ($marketId){ + if (is_array($marketId)){ + $where[] = ['in'=>['market_id'=>$marketId]]; + }else{ + $where['market_id'] = $marketId; } - }elseif($aud->isRole('lanzu_mp')){ - $count = ImsCjdcStore::count(); - }else{ - $count = ImsCjdcStore::count(); } - $this->content($count); + switch ($type){ + case '1': + $beginTime=mktime(0,0,0,date('m'),date('d'),date('Y')); + $endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1; + break; + case '-1': + $beginTime=mktime(0,0,0,date('m'),date('d')-1,date('Y')); + $endTime=mktime(0,0,0,date('m'),date('d'),date('Y'))-1; + break; + case '7': + $beginTime=mktime(0,0,0,date('m'),date('d')-7,date('Y')); + $endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1; + break; + case '30': + $beginTime=mktime(0,0,0,date('m'),1,date('Y')); + $endTime=mktime(23,59,59,date('m'),date('t'),date('Y')); + break; + case '-30': + $beginTime=mktime(0,0,0,date('m')-1,1,date('Y')); + $endTime=strtotime(date("Y-m-d H:i:s",mktime(23,59,59,date("m") ,0,date("Y")))); + break; + default: + $beginTime=0; + $endTime=999999999999999; + break; + } + + $build = LanzuStore + ::whereBetween('created_at',[$beginTime,$endTime]) + ->where($where); + return $build; + } + + + public function storeNum($type,$marketId) + { + $build = $this->storeBuild($type,$marketId); + $result = $build->count(); + return $result; } + // 传递自定义参数到 handle 方法 + public function parameters() : array + { + return [ + 'market_id'=>$this->market_id, + ]; + } + + public function renderContent() { $content = parent::renderContent(); From 66d528ce1d6399ea4c29093931365813fcaec582 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 14:47:05 +0800 Subject: [PATCH 43/56] 1 --- app/Admin/Controllers/HomeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index 6922a72..149bd0d 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -75,7 +75,7 @@ class HomeController extends Controller $column->row(new Examples\Order\OrderData('number',$marketIds,'订单数')); }); $row->column(3, function (Column $column)use ($marketIds) { - $column->row(new Examples\Order\OrderData('amount',$marketIds,'订单金额')); + $column->row(new Examples\Order\OrderData('amount',$marketIds,'订单金额(元)')); }); }); } From dc9d7ec79b308bece2844d69699b39c7095d8cd9 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 14:59:52 +0800 Subject: [PATCH 44/56] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Metrics/Examples/Community/TotalAmount.php | 2 +- app/Admin/Metrics/Examples/Order/OrderData.php | 2 +- app/Admin/Metrics/Examples/ServiceCard/TotalStore.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Admin/Metrics/Examples/Community/TotalAmount.php b/app/Admin/Metrics/Examples/Community/TotalAmount.php index 7f79c75..2d075eb 100644 --- a/app/Admin/Metrics/Examples/Community/TotalAmount.php +++ b/app/Admin/Metrics/Examples/Community/TotalAmount.php @@ -32,7 +32,7 @@ class TotalAmount extends Card { $content = parent::renderContent(); return << +

{$content}

HTML; diff --git a/app/Admin/Metrics/Examples/Order/OrderData.php b/app/Admin/Metrics/Examples/Order/OrderData.php index 974ef81..771e803 100644 --- a/app/Admin/Metrics/Examples/Order/OrderData.php +++ b/app/Admin/Metrics/Examples/Order/OrderData.php @@ -121,7 +121,7 @@ class OrderData extends Card { $content = parent::renderContent(); return << +

{$content}

HTML; diff --git a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php index d4eb5ab..c727038 100644 --- a/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php +++ b/app/Admin/Metrics/Examples/ServiceCard/TotalStore.php @@ -106,7 +106,7 @@ class TotalStore extends Card { $content = parent::renderContent(); return << +

{$content}

HTML; From 681727ee1e3054d68efc82aaf26047a467de1707 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 15:12:17 +0800 Subject: [PATCH 45/56] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuCsWithdrawController.php | 2 +- app/Admin/Controllers/LanzuFinancialRecord.php | 1 + app/Models/LanzuUserBalance.php | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php index cfb7bda..f0109b1 100644 --- a/app/Admin/Controllers/LanzuCsWithdrawController.php +++ b/app/Admin/Controllers/LanzuCsWithdrawController.php @@ -92,7 +92,7 @@ class LanzuCsWithdrawController extends AdminController if ($user->isRole('lanzu_cs')) {//如果是社区站点角色 $cs = LanzuCsInfo::where('admin_user_id', $user->id)->first(); if ($cs) { - $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, ))->disable(); + $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id,Type::BALANCE_USER_TYPE_CS))->disable(); $form->hidden('cs_id', '提现用户id')->value($cs->id); $form->text('csInfo.name', '提现用户')->value($cs->name)->disable(); $form->number('money')->min(env('MIN_MONEY'))->max(env('MAX_MONEY')); diff --git a/app/Admin/Controllers/LanzuFinancialRecord.php b/app/Admin/Controllers/LanzuFinancialRecord.php index f2640de..d183ecd 100644 --- a/app/Admin/Controllers/LanzuFinancialRecord.php +++ b/app/Admin/Controllers/LanzuFinancialRecord.php @@ -66,6 +66,7 @@ class LanzuFinancialRecord extends AdminController } }); + $grid->disableActions(); $grid->disableViewButton(); $grid->disableCreateButton(); $grid->disableEditButton(); diff --git a/app/Models/LanzuUserBalance.php b/app/Models/LanzuUserBalance.php index fb46939..f55d0f8 100644 --- a/app/Models/LanzuUserBalance.php +++ b/app/Models/LanzuUserBalance.php @@ -16,10 +16,9 @@ class LanzuUserBalance extends Model * @param $uid * @param $uType 0/1 普通用户/服务商 */ - public static function getBalance($uid, $uType = 0) + public static function getBalance($uid, $uType=null) { $row = self::where(['source_id' => $uid, 'user_type' => $uType])->first(); - if ($row) { return $row->balance; } else { From af17eff8cc76eefa12827f3a1050cde48e962c69 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 15:15:51 +0800 Subject: [PATCH 46/56] 1 --- app/Admin/Common/Type.php | 2 +- app/Admin/Metrics/Examples/Community/TotalUser.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Admin/Common/Type.php b/app/Admin/Common/Type.php index 2580278..1e7b58a 100644 --- a/app/Admin/Common/Type.php +++ b/app/Admin/Common/Type.php @@ -25,7 +25,7 @@ class Type const MONEY_TYPE_USER_OFL_ORDER = 100; // 用户线下支付订单 const MONEY_TYPE_USER_OL_ORDER = 101; // 用户线上支付订单 - const MONEY_TYPE_MP = 102; //市场经理提现类型 + const MONEY_TYPE_MP = 102; //服务商提现类型 const MONEY_TYPE_MM = 103; //市场经理提现类型 const MONEY_TYPE_CS = 104; //社区提现类型 diff --git a/app/Admin/Metrics/Examples/Community/TotalUser.php b/app/Admin/Metrics/Examples/Community/TotalUser.php index 4aea10f..e186c71 100644 --- a/app/Admin/Metrics/Examples/Community/TotalUser.php +++ b/app/Admin/Metrics/Examples/Community/TotalUser.php @@ -27,7 +27,7 @@ class TotalUser extends Card { $content = parent::renderContent(); return << +

{$content}

HTML; From c45edbc43e16c532111c5ead86a1e29daee9fbe0 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 15:57:53 +0800 Subject: [PATCH 47/56] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuCsWithdrawController.php | 1 + app/Admin/Controllers/LanzuMpWithdrawController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php index f0109b1..75aa1f5 100644 --- a/app/Admin/Controllers/LanzuCsWithdrawController.php +++ b/app/Admin/Controllers/LanzuCsWithdrawController.php @@ -44,6 +44,7 @@ class LanzuCsWithdrawController extends AdminController } $grid->disableViewButton(); $grid->disableDeleteButton(); + $grid->disableActions(); $grid->id->sortable(); $grid->column('csInfo.name', '提现用户'); $grid->money; diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 7c88e58..1cf3a6b 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -58,6 +58,7 @@ class LanzuMpWithdrawController extends AdminController }); if ($current_user->isRole('lanzu_mp')) { $grid->disableEditButton(); + $grid->disableActions(); } else { $grid->disableCreateButton(); } @@ -189,7 +190,6 @@ class LanzuMpWithdrawController extends AdminController $balance = $mpb->balance; } return Form::make(new LanzuMpWithdraw(), function (Form $form) use ($current_user, $balance, $mpb, $mp) { - $form->footer(function ($footer) { // 去掉`查看`checkbox From b47ab918d627674034fd4cdb5bbac5f67fe13fbf Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 15:59:55 +0800 Subject: [PATCH 48/56] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E8=A1=A8--=E6=B8=85=E6=B4=97=E6=95=B0=E6=8D=AE=20=EF=BC=8Cuser?= =?UTF-8?q?=5Ftype=20=E4=B8=BA3=E7=9A=84=E6=B4=97=E4=B8=BA4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/SetStoreBalance.php | 16 +++-- app/Console/Commands/SetUserBalanceType.php | 67 +++++++++++++++++++++ 2 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 app/Console/Commands/SetUserBalanceType.php diff --git a/app/Console/Commands/SetStoreBalance.php b/app/Console/Commands/SetStoreBalance.php index c61a322..3902d76 100644 --- a/app/Console/Commands/SetStoreBalance.php +++ b/app/Console/Commands/SetStoreBalance.php @@ -40,8 +40,11 @@ class SetStoreBalance extends Command */ public function handle() { - $oldData = DB::table('ims_cjdc_store')->get(); - var_dump('start_time:'.date('H:i:s',time())); + $oldTableName = 'ims_cjdc_store'; + $newTableName = 'lanzu_user_balance'; + + $oldData = DB::table($oldTableName)->get(); + $bar = $this->output->createProgressBar(count($oldData)); $bar->start(); @@ -49,7 +52,7 @@ class SetStoreBalance extends Command $newData = []; foreach ($oldData as $key => $value){ // 查询店铺是否存在balance - $exist = DB::table('lanzu_user_balance') + $exist = DB::table($newTableName) ->where('source_id',$value->id) ->where('user_type',5) ->first(); @@ -71,14 +74,15 @@ class SetStoreBalance extends Command $bar->advance(); } // 添加到新表 - $res = DB::table('lanzu_user_balance')->insert($newData); + $res = DB::table($newTableName)->insert($newData); $bar->finish(); - var_dump(' end_time: '.date('H:i:s',time())); + var_dump('new_total: '.count($newData)); var_dump('exist: '.count($data)); + var_dump($data); var_dump('res: '.$res); - // var_dump($data); + return 0; } } diff --git a/app/Console/Commands/SetUserBalanceType.php b/app/Console/Commands/SetUserBalanceType.php new file mode 100644 index 0000000..0c13e32 --- /dev/null +++ b/app/Console/Commands/SetUserBalanceType.php @@ -0,0 +1,67 @@ +get(); + + $bar = $this->output->createProgressBar(count($oldData)); + $bar->start(); + + $total = 0; + $newData = []; + foreach ($oldData as $key => $value){ + + if($value->user_type == 3){ + $newData = [ + 'user_type' => 4, + 'updated_at' => time() + ]; + if(DB::table('lanzu_user_balance')->where('id',$value->id)->update($newData)){ + $total++; + } + } + $bar->advance(); + } + + $bar->finish(); + + var_dump('total: '.$total); + + return 0; + } +} From 4b9f612cbdc31ff2512619051ca49f96ef171dba Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 16:07:56 +0800 Subject: [PATCH 49/56] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=91=98=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/LanzuServiceHorseman.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php index 868cde9..8fba949 100644 --- a/app/Models/LanzuServiceHorseman.php +++ b/app/Models/LanzuServiceHorseman.php @@ -33,10 +33,11 @@ class LanzuServiceHorseman extends Model //获取骑手名称 if ($hid){ $horseman = LanzuServiceHorseman::find($hid); - return $horseman->name; - }else{ - return '--'; + if ($horseman){ + return $horseman->name; + } } + return '--'; } } From 08e7e999acc20e82cb9de0bdbac7f08461a64bf0 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 16:13:19 +0800 Subject: [PATCH 50/56] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/orderdetail.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php index 6a07915..b83d24e 100644 --- a/resources/views/orderdetail.php +++ b/resources/views/orderdetail.php @@ -39,7 +39,6 @@ {{item.store.name}} - 店铺商品
商品图片
From 65fcb32fa0b2ffcd16c4c13af401e08755fb764f Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 16:16:31 +0800 Subject: [PATCH 51/56] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/orderdetail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php index b83d24e..59f2a75 100644 --- a/resources/views/orderdetail.php +++ b/resources/views/orderdetail.php @@ -63,7 +63,7 @@    配送费: +{{delivery_money}} 元    - 增值服务费: +{{services_money}} 元 + 增值服务费: +{{services_money?services_money:0}} 元    实付金额: {{money}} 元 From 00e419da985acb8da81139ef47b5ad360b4cf3fa Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 16:20:03 +0800 Subject: [PATCH 52/56] =?UTF-8?q?=E6=B4=97=E5=95=86=E5=93=81-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E5=95=86=E5=93=81=E6=A0=B9=E6=8D=AE=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=89=80=E5=B1=9E=E5=B8=82=E5=9C=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B8=82=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/v3/GoodsNewController.php | 11 +++++++---- app/Console/Commands/SetUserBalanceType.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 8eb48c1..ce6f1ea 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -196,7 +196,7 @@ class GoodsNewController extends AdminController // $marketList = MarketModel::getMarketArray(); $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){ - // $form->hidden('market_id')->default(0); + $form->hidden('market_id')->default(0); $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list'); $form->select('goods_category_id'); $form->select('store_id')->required()->options($storeList); @@ -257,10 +257,13 @@ class GoodsNewController extends AdminController $spec = $form->input('spec'); $detailsImgs = $form->input('details_imgs'); $goodsCategoryId = $form->input('goods_category_id'); - // 商品所属市场，根据店铺查询市场 - // $info = StoreModel::getStoreInfo($storeId,'market_id'); - // $form->market_id = $info->market_id; + if($form->isCreating() && !empty($storeId)){ + // 商品所属市场，根据店铺查询市场 + $info = StoreModel::getStoreInfo($storeId,'market_id'); + $form->market_id = $info->market_id; + } + $tags = $form->input('tags'); if(!empty($tags)){ $tagsArr = []; diff --git a/app/Console/Commands/SetUserBalanceType.php b/app/Console/Commands/SetUserBalanceType.php index 0c13e32..5e06a47 100644 --- a/app/Console/Commands/SetUserBalanceType.php +++ b/app/Console/Commands/SetUserBalanceType.php @@ -19,7 +19,7 @@ class SetUserBalanceType extends Command * * @var string */ - protected $description = 'Command 清洗用户余额表type字段值，type为3洗为4'; + protected $description = 'Command 清洗用户余额用户类型字段值，user_type为3洗为4'; /** * Create a new command instance. From 6787b783cacd11828d4f004a29b04f7c5634c2af Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 17:43:06 +0800 Subject: [PATCH 53/56] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=8E=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Forms/RefundNote.php | 2 +- .../Metrics/Examples/Community/TotalAmount.php | 15 ++++++++++++++- .../Metrics/Examples/Community/TotalCommunity.php | 2 +- .../Metrics/Examples/ServiceCard/TotalMp.php | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/Admin/Forms/RefundNote.php b/app/Admin/Forms/RefundNote.php index 4335ba0..8a99b7b 100644 --- a/app/Admin/Forms/RefundNote.php +++ b/app/Admin/Forms/RefundNote.php @@ -24,7 +24,7 @@ class RefundNote extends Form $current_page = request()->get('current_page'); $order = ImsCjdcOrderMain::where('id', $oid)->first(); $order->refuse_refund_note = $note; - $order->state = 10; + $order->state = 2; $order->updated_at = time(); if ($order->save()) { $storeIds = ImsCjdcOrder::where('order_main_id',$order->global_order_id)->pluck('store_id')->toArray(); diff --git a/app/Admin/Metrics/Examples/Community/TotalAmount.php b/app/Admin/Metrics/Examples/Community/TotalAmount.php index 2d075eb..a0c36d9 100644 --- a/app/Admin/Metrics/Examples/Community/TotalAmount.php +++ b/app/Admin/Metrics/Examples/Community/TotalAmount.php @@ -3,6 +3,8 @@ namespace App\Admin\Metrics\Examples\Community; use App\Models\LanzuUserBalance; +use Dcat\Admin\Admin; +use Dcat\Admin\Support\Helper; use Dcat\Admin\Widgets\Metrics\Card; class TotalAmount extends Card @@ -21,7 +23,6 @@ class TotalAmount extends Card { parent::init(); $this->content(LanzuUserBalance::getBalance($this->uid, $this->uType)); - } /** @@ -30,11 +31,23 @@ class TotalAmount extends Card */ public function renderContent() { + $content = parent::renderContent(); + $adu = Admin::user(); + $url = ""; + if ($adu->isRole('lanzu_mp')){ + $url = url('admin/mp_withdraw/create'); + }elseif ($adu->isRole('lanzu_cs')){ + $url = url('admin/cs_withdraw/create'); + }elseif ($adu->isRole('lanzu_mm')){ + $url = url('admin/mm_withdraw/create'); + } return <<

{$content}

+ +提现 HTML; } diff --git a/app/Admin/Metrics/Examples/Community/TotalCommunity.php b/app/Admin/Metrics/Examples/Community/TotalCommunity.php index 527305b..da2818b 100644 --- a/app/Admin/Metrics/Examples/Community/TotalCommunity.php +++ b/app/Admin/Metrics/Examples/Community/TotalCommunity.php @@ -25,7 +25,7 @@ class TotalCommunity extends Card { $content = parent::renderContent(); return << +

{$content}

HTML; diff --git a/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php b/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php index 075aa13..daf9e4e 100644 --- a/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php +++ b/app/Admin/Metrics/Examples/ServiceCard/TotalMp.php @@ -24,7 +24,7 @@ class TotalMp extends Card { $content = parent::renderContent(); return << +

{$content}

HTML; From 448fa6e39fcfdd4f1b418031414117dd22b53c50 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 17:45:44 +0800 Subject: [PATCH 54/56] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/HomeController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index 149bd0d..25ecf69 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -121,11 +121,10 @@ class HomeController extends Controller ->description('欢迎回到懒族后台') ->body(function (Row $row) { $row->column(4, function (Column $column) { - $column->row(new Examples\Community\TotalUser()); + $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS)); }); - $row->column(4, function (Column $column) { - $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS)); + $column->row(new Examples\Community\TotalUser()); }); }); } From 306083076de68fccd238e3a4b66e9cfa6df29365 Mon Sep 17 00:00:00 2001 From: lanzu_qinsheng <334039090@qq.com> Date: Wed, 16 Sep 2020 18:33:53 +0800 Subject: [PATCH 55/56] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuServiceRewardController.php | 1 + app/Admin/Extensions/OrderStateHandle.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Admin/Controllers/LanzuServiceRewardController.php b/app/Admin/Controllers/LanzuServiceRewardController.php index cd412bf..b06bd29 100644 --- a/app/Admin/Controllers/LanzuServiceRewardController.php +++ b/app/Admin/Controllers/LanzuServiceRewardController.php @@ -88,6 +88,7 @@ class LanzuServiceRewardController extends AdminController $ssdb->multi_hset('set_reward_' . $form->type, $data); }); $form->disableViewButton(); + $form->disableDeleteButton(); }); } } diff --git a/app/Admin/Extensions/OrderStateHandle.php b/app/Admin/Extensions/OrderStateHandle.php index 05c1bb5..ad19a2f 100644 --- a/app/Admin/Extensions/OrderStateHandle.php +++ b/app/Admin/Extensions/OrderStateHandle.php @@ -52,7 +52,7 @@ class OrderStateHandle extends RowAction Log::error('订单退款接口调用失败',$result); return $this->response()->error($result['message'])->refresh(); } - //$orderMain->modifyState($id,$state); + $orderMain->modifyState($id,$state); return $this->response()->success($result['message'])->refresh(); }elseif ($state==3){//接单 $res = $orderMain->modifyState($id,$state); From e2973cbffb34d011ef966c4edd06261e84b8cb81 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 16 Sep 2020 18:53:22 +0800 Subject: [PATCH 56/56] =?UTF-8?q?=E5=BA=97=E9=93=BA=5Fnew=E6=8D=A2?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/GoodsNewController.php | 2 +- app/Console/Commands/MigrateGoods.php | 160 ------------------ .../Commands/MigrateOrderStatistics.php | 2 +- app/Console/Commands/MigrateStore.php | 4 +- app/Models/v3/Store.php | 2 +- 5 files changed, 5 insertions(+), 165 deletions(-) delete mode 100644 app/Console/Commands/MigrateGoods.php diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index ce6f1ea..3317b5d 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -89,7 +89,7 @@ class GoodsNewController extends AdminController $filter->equal('goods_unit'); }); - $grid->model()->orderBy('category_id', 'asc'); + $grid->model()->orderBy('goods_category_id', 'asc'); // 每页10条 $grid->paginate(10); }); diff --git a/app/Console/Commands/MigrateGoods.php b/app/Console/Commands/MigrateGoods.php deleted file mode 100644 index 1f125c7..0000000 --- a/app/Console/Commands/MigrateGoods.php +++ /dev/null @@ -1,160 +0,0 @@ -orderBy('id','asc')->get(); - $oldStoreData = DB::table($oldStoreTableName)->pluck('market_id','id'); - $bar = $this->output->createProgressBar(count($oldData)); - $bar->start(); - $startTime = time(); - $total = 0; - $error = []; - foreach ($oldData as $value){ - $goodsId = $value->id; - // 判断店铺是否存在，如果商品的店铺不在，则不存这个商品 - $storeExist = DB::table($oldStoreTableName)->where('id',$value->store_id)->exists(); - if(!$storeExist){ - continue; - } - $goodsData =[ - // 'id'=>$value->id, - 'market_id' => $oldStoreData[$value->store_id], - 'store_id'=>$value->store_id, - 'on_sale'=> $value->is_show == 1 ? 1 : 0, - 'sort'=>$value->num, - 'price'=>$value->money, - 'original_price'=> ($value->money2 < $value->money)?$value->money:$value->money2, - 'vip_price'=>$value->vip_money, - 'sales'=>$value->sales, - 'start_num'=>$value->start_num, - 'restrict_num'=>$value->restrict_num, - 'is_infinite'=> $value->is_max == 1 ? 1 :0, - 'inventory'=>$value->inventory, - 'name'=>$value->name, - 'cover_img'=>$value->logo, - 'goods_unit'=>$value->good_unit, - - 'content'=> strip_tags($value->content), - 'details'=> strip_tags($value->details), - - 'created_at' => time(), - 'updated_at' => time(), - ]; - $specs = DB::table($oldSpecTableName)->where('good_id',$goodsId)->get(); - if(count($specs) > 0){ - foreach($specs as $vs){ - $spec = ['spec_key'=>'净含量','spec_value'=>$vs->combination]; - if(strstr($vs->combination,'辣')){ - $spec['spec_key'] = '口味'; - }else if(strstr($vs->combination,'馅')){ - $spec['spec_key'] = '馅料'; - }else if(strstr($vs->combination,'mm')){ - $spec['spec_key'] = '尺寸'; - } - - $goodsData['spec'] = json_encode([$spec]); - - $newData = $goodsData; - $newBanner = [ - 'type' =>1, - 'path' =>$value->logo, - 'created_at' =>time(), - 'updated_at' =>time(), - ]; - $id = DB::table($newTableName)->insertGetId($newData); - - if(!$id){ - $error[] = ['id'=>$goodsId]; - break; - } - $newBanner['goods_id'] = $id; - DB::table($newBannerTableName)->insertGetId($newBanner); - $total++; - } - }else{ - $newData = $goodsData; - $res= $id = DB::table($newTableName)->insertGetId($newData); - if(!$res){ - $error[] = ['id'=>$goodsId]; - break; - } - $newBanner['goods_id'] = $id; - DB::table($newBannerTableName)->insertGetId($newBanner); - $total++; - } - $bar->advance(); - } - - $bar->finish(); - var_dump([time()-$startTime]); - var_dump($total); - var_dump($error); - return 0; - } -} diff --git a/app/Console/Commands/MigrateOrderStatistics.php b/app/Console/Commands/MigrateOrderStatistics.php index c2bab97..88c735b 100644 --- a/app/Console/Commands/MigrateOrderStatistics.php +++ b/app/Console/Commands/MigrateOrderStatistics.php @@ -40,7 +40,7 @@ class MigrateOrderStatistics extends Command public function handle() { $oldTableName = 'ims_cjdc_order_sales_statistics'; - $newTableName = 'lanzu_order_sales_statistics_copy'; + $newTableName = 'lanzu_order_sales_statistics'; // 判断表是否存在 if(!Schema::hasTable($oldTableName)){ var_dump('旧表不存在'); diff --git a/app/Console/Commands/MigrateStore.php b/app/Console/Commands/MigrateStore.php index 6d4d42f..235e28e 100644 --- a/app/Console/Commands/MigrateStore.php +++ b/app/Console/Commands/MigrateStore.php @@ -39,8 +39,8 @@ class MigrateStore extends Command */ public function handle() { - $oldTableName = 'ims_cjdc_store_new'; - $newTableName = 'lanzu_store_new'; + $oldTableName = 'ims_cjdc_store'; + $newTableName = 'lanzu_store'; // $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */ // $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */ // 判断表是否存在 diff --git a/app/Models/v3/Store.php b/app/Models/v3/Store.php index 2988381..7d9f95b 100644 --- a/app/Models/v3/Store.php +++ b/app/Models/v3/Store.php @@ -11,7 +11,7 @@ class Store extends Model use HasDateTimeFormatter; use SoftDeletes; - protected $table = 'lanzu_store_new'; + protected $table = 'lanzu_store'; protected $dateFormat = 'U'; /* 查询记录数 limit */