From cb373a99e5e52cff842f6bd7f7987fdec6257502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com> Date: Mon, 27 Mar 2023 09:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Api.php | 116 +++ app/admin/controller/StoreProduct.php | 125 +-- app/admin/controller/product/Product.php | 737 ++++++++++++++++-- app/admin/view/product/product/adds.html | 475 +++++++++++ app/admin/view/product/product/edit.html | 585 ++++++++++---- app/admin/view/product/product/index.html | 5 + app/admin/view/store_product/datalist.html | 2 +- public/static/assets/gougu/module/skuTable.js | 14 +- 8 files changed, 1798 insertions(+), 261 deletions(-) create mode 100644 app/admin/view/product/product/adds.html diff --git a/app/admin/controller/Api.php b/app/admin/controller/Api.php index e03958f..01c8fe5 100644 --- a/app/admin/controller/Api.php +++ b/app/admin/controller/Api.php @@ -141,6 +141,122 @@ class Api extends BaseController return to_assign(1, '上传失败，请重试'); } } + + //上传文件 + public function upload2() + { + $param = get_params(); + //var_dump($param);exit; + $sourse = 'file'; + if(isset($param['sourse'])){ + $sourse = $param['sourse']; + } + if($sourse == 'file' || $sourse == 'tinymce'){ + if(request()->file('file')){ + $file = request()->file('file'); + } + else{ + return to_assign(1, '没有选择上传文件'); + } + } + else{ + if (request()->file('editormd-image-file')) { + $file = request()->file('editormd-image-file'); + } else { + return to_assign(1, '没有选择上传文件'); + } + } + // 获取上传文件的hash散列值 + $sha1 = $file->hash('sha1'); + $md5 = $file->hash('md5'); + $rule = [ + 'image' => 'jpg,png,jpeg,gif', + 'doc' => 'doc,docx,ppt,pptx,xls,xlsx,pdf', + 'file' => 'zip,gz,7z,rar,tar', + 'video' => 'mpg,mp4,mpeg,avi,wmv,mov,flv,m4v', + ]; + $fileExt = $rule['image'] . ',' . $rule['doc'] . ',' . $rule['file'] . ',' . $rule['video']; + //1M=1024*1024=1048576字节 + $fileSize = 100 * 1024 * 1024; + if (isset($param['type']) && $param['type']) { + $fileExt = $rule[$param['type']]; + } + if (isset($param['size']) && $param['size']) { + $fileSize = $param['size']; + } + $validate = \think\facade\Validate::rule([ + 'image' => 'require|fileSize:' . $fileSize . '|fileExt:' . $fileExt, + ]); + $file_check['image'] = $file; + if (!$validate->check($file_check)) { + return to_assign(1, $validate->getError()); + } + // 日期前綴 + $dataPath = date('Ym'); + $use = 'thumb'; + $accessKeyId = "LTAI5t7mhH3ij2cNWs1zhPmv"; ; + $accessKeySecret = "gqo2wMpvi8h5bDBmCpMje6BaiXvcPu"; + $endpoint = "oss-cn-chengdu.aliyuncs.com"; + try { + $ossClient = new OssClient($accessKeyId, $accessKeySecret, $endpoint); + } catch (OssException $e) { + return to_assign(1, $e->getMessage()); + } + $bucket = "lihai001"; + $object = 'storage/'.$dataPath.'/'.$md5.'.jpg'; +// $filename = \think\facade\Filesystem::disk('public')->putFile($dataPath, $file, function () use ($md5) { +// return $md5; +// }); + try { + $filename=$ossClient->uploadFile($bucket, $object,$file); + } catch (OssException $e) { + return to_assign(1, $e->getMessage()); + } + if ($filename) { + //写入到附件表 + $data = []; + $path = get_config('filesystem.disks.public.url'); + $data['filepath'] = $filename['info']['url']; + $data['name'] = $file->getOriginalName(); + $data['mimetype'] = $file->getOriginalMime(); + $data['fileext'] = $file->extension(); + $data['filesize'] = $file->getSize(); + $data['filename'] = $object; + $data['sha1'] = $sha1; + $data['md5'] = $md5; + $data['module'] = \think\facade\App::initialize()->http->getName(); + $data['action'] = app('request')->action(); + $data['uploadip'] = app('request')->ip(); + $data['create_time'] = time(); + $data['user_id'] = get_login_admin('id') ? get_login_admin('id') : 0; + if ($data['module'] = 'admin') { + //通过后台上传的文件直接审核通过 + $data['status'] = 1; + $data['admin_id'] = $data['user_id']; + $data['audit_time'] = time(); + } + $data['use'] = request()->has('use') ? request()->param('use') : $use; //附件用处 + $res['id'] = Db::name('file')->insertGetId($data); + $res['url'] = $data['filepath']; + $res['name'] = $data['name']; + $res['filename'] = $data['filename']; + add_log('upload', $data['user_id'], $data); + if($sourse == 'editormd'){ + //editormd编辑器上传返回 + return json(['success'=>1,'message'=>'上传成功','url'=>$data['filepath']]); + } + else if($sourse == 'tinymce'){ + //tinymce编辑器上传返回 + return json(['success'=>1,'message'=>'上传成功','location'=>$data['filepath']]); + } + else{ + //普通上传返回 + return to_assign(200, '上传成功', $res); + } + } else { + return to_assign(1, '上传失败，请重试'); + } + } //获取权限树所需的节点列表 public function get_rule() diff --git a/app/admin/controller/StoreProduct.php b/app/admin/controller/StoreProduct.php index bb217cd..0ce5368 100644 --- a/app/admin/controller/StoreProduct.php +++ b/app/admin/controller/StoreProduct.php @@ -53,57 +53,13 @@ class StoreProduct extends BaseController return view(); } } - /** - * 添加 - */ + * 添加 + */ public function add() { - if (request()->isAjax()) { - $param = get_params(); - $data=$param; - $data['mer_id'] = 4; - $data['status'] = 1; - $data['mer_status'] =1; - $data['rate'] = 3; - $data['spec_type'] = 0;//商品规格 - if (!$data['spec_type']) { - $data['attr'] = []; - if (count($data['skus']) > 1) throw new ValidateException('单规格商品属性错误'); - } - $content = [ - 'content' => $data['content'] , - 'type' => 0 - ]; - $productType=0; - $conType=0; - $product = $this->setProduct($data); - // event('product.create.before', compact('data','productType','conType')); - return Db::transaction(function () use ($data, $productType,$conType,$content,$product) { - $activity_id = 0; - $result = Db::connect('shop')->table()->create($product); - $settleParams = $this->setAttrValue($data, $result->product_id, $productType, 0); - $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']); - $settleParams['attr'] = $this->setAttr($data['attr'], $result->product_id); - if ($productType ==0 ) app()->make(ParameterValueRepository::class)->create($result->product_id, $data['params'] ?? [],$data['mer_id']); - $this->save($result->product_id, $settleParams, $content,$product,$productType); - if (in_array($productType, [0, 1])) { - if ($productType == 1) { //秒杀商品 - $dat = $this->setSeckillProduct($data); - $dat['product_id'] = $result->product_id; - $seckill = app()->make(StoreSeckillActiveRepository::class)->create($dat); - $activity_id = $seckill->seckill_active_id; - } - $product['price'] = $settleParams['data']['price']; - $product['mer_labels'] = $data['mer_labels']; - app()->make(SpuRepository::class)->create($product, $result->product_id, $activity_id, $productType); - } - $product = $result; - event('product.create',compact('product')); - return $result->product_id; - }); - halt($data); - + if (request()->isAjax()) { + $param = get_params(); // 检验完整性 try { validate(StoreProductValidate::class)->check($param); @@ -111,16 +67,83 @@ class StoreProduct extends BaseController // 验证失败 输出错误信息 return to_assign(1, $e->getError()); } - + $param['admin_id'] = $this->uid; $this->model->addStoreProduct($param); }else{ $store_brand= Db::connect('shop')->table('eb_store_brand')->where(['is_show' => 1]) ->select(); View::assign('store_brand', $store_brand); - return view(); - } + return view(); + } } +// /** +// * 添加 +// */ +// public function add() +// { +// if (request()->isAjax()) { +// $param = get_params(); +// $data=$param; +// $data['mer_id'] = 4; +// $data['status'] = 1; +// $data['mer_status'] =1; +// $data['rate'] = 3; +// $data['spec_type'] = 0;//商品规格 +// if (!$data['spec_type']) { +// $data['attr'] = []; +// if (count($data['skus']) > 1) throw new ValidateException('单规格商品属性错误'); +// } +// $content = [ +// 'content' => $data['content'] , +// 'type' => 0 +// ]; +// $productType=0; +// $conType=0; +// $product = $this->setProduct($data); +// // event('product.create.before', compact('data','productType','conType')); +// return Db::transaction(function () use ($data, $productType,$conType,$content,$product) { +// $activity_id = 0; +// $result = Db::connect('shop')->table()->create($product); +// $settleParams = $this->setAttrValue($data, $result->product_id, $productType, 0); +// $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']); +// $settleParams['attr'] = $this->setAttr($data['attr'], $result->product_id); +// if ($productType ==0 ) app()->make(ParameterValueRepository::class)->create($result->product_id, $data['params'] ?? [],$data['mer_id']); +// $this->save($result->product_id, $settleParams, $content,$product,$productType); +// if (in_array($productType, [0, 1])) { +// if ($productType == 1) { //秒杀商品 +// $dat = $this->setSeckillProduct($data); +// $dat['product_id'] = $result->product_id; +// $seckill = app()->make(StoreSeckillActiveRepository::class)->create($dat); +// $activity_id = $seckill->seckill_active_id; +// } +// $product['price'] = $settleParams['data']['price']; +// $product['mer_labels'] = $data['mer_labels']; +// app()->make(SpuRepository::class)->create($product, $result->product_id, $activity_id, $productType); +// } +// $product = $result; +// event('product.create',compact('product')); +// return $result->product_id; +// }); +// halt($data); +// +// // 检验完整性 +// try { +// validate(StoreProductValidate::class)->check($param); +// } catch (ValidateException $e) { +// // 验证失败 输出错误信息 +// return to_assign(1, $e->getError()); +// } +// +// $this->model->addStoreProduct($param); +// }else{ +// +// $store_brand= Db::connect('shop')->table('eb_store_brand')->where(['is_show' => 1]) +// ->select(); +// View::assign('store_brand', $store_brand); +// return view(); +// } +// } public function adds() { if (request()->isAjax()) { diff --git a/app/admin/controller/product/Product.php b/app/admin/controller/product/Product.php index bafee0e..e83deee 100644 --- a/app/admin/controller/product/Product.php +++ b/app/admin/controller/product/Product.php @@ -7,16 +7,18 @@ namespace app\admin\controller\product; use app\admin\BaseController; +use think\exception\ValidateException; use think\facade\Db; use think\facade\View; use app\admin\model\Merchant; // 商户模型 use app\admin\model\EbStoreProduct; // 商品模型 use app\admin\model\StoreCategory; // 商品分类模型 use app\common\controller\FormatList; - -// use app\admin\model\GeoCity; // 省市模型 -// use app\admin\model\GeoArea; // 区域模型 -// use app\admin\model\GeoStreet; // 街道模型 +use app\admin\model\StoreProduct as StoreProductModel; +use app\admin\validate\StoreProductValidate; + use app\admin\model\GeoCity; // 省市模型 + use app\admin\model\GeoArea; // 区域模型 + use app\admin\model\GeoStreet; // 街道模型 use app\admin\model\SupplyChain; // 供应链模型 // use app\api\model\Area as AreaModel; // 市场区域模型 // use app\api\model\AreaManager as AreaManagerModel; // 区域负责人模型 @@ -41,7 +43,7 @@ class Product extends BaseController $this->product = $product; $this->url=[ '/admin/product.product/index', - '/admin/product.product/add', + '/admin/product.product/adds', '/admin/product.product/edit', '/admin/product.product/delete', '/admin/product.product/index', @@ -120,7 +122,7 @@ class Product extends BaseController $where = array_merge($where, $this->switchType($where['type'],$mer_id,0)); } $mer_id = isset($params['mer_id'])?$params['mer_id']:NULL; - + $data = $this->product->getList($mer_id, $where, $page, $limit); @@ -208,69 +210,585 @@ class Product extends BaseController return $where; } +// /** +// * +// * 新增 +// * +// */ +// public function add() +// { +// if (request()->isAjax()) { +// +// $params = get_params(); +// +// $data['user_id'] = $this->adminInfo['id']; // 操作用户ID +// $data['name'] = $params['title']; // 团队名称 +// $data['tel'] = $params['phone']; // 联系电话 +// $data['mer_id_list'] = json_encode($params['mer_id']); // 已选商户 +// +// $data['street_id'] = $params['street_id']; // 街道ID +// $street = GeoStreet::where('street_id', $data['street_id'])->find(); // 街道数据 +// $data['lng'] = $street['lng']; // 经度 +// $data['lat'] = $street['lat']; // 纬度 +// $area = $street->area; // 区数据 +// $data['area_id'] = $area['area_id']; // 区县id +// $city = $area->city; // 获取市级 +// $data['address'] = $city['city_name'] . $area['area_name'] . $street['street_name']; // 实际地址 +// $data['create_time'] = date('Y-m-d H:i:s'); +// +// // 数据入库 +// $res = SupplyChain::create($data); +// +// // 关联数据入库 +// foreach ($params['mer_id'] as $v) { +// +// $dataLink = [ +// 'eb_merchant_id' => $v, // 商户ID +// 'user_id' => $data['user_id'], +// 'create_time' => $data['create_time'], +// ]; +// +// $res->linkMerchant()->save($dataLink); // 插入关联数据 +// } +// +// if ($res){ +// return to_assign(0,'操作成功',['aid'=>$res]); +// } +// +// return to_assign(1, '操作失败，原因：'.$res); +// +// }else{ +// +// // 取出正常的商家 +// $merchant = Merchant::where('status', 1)->column('mer_id, real_name'); +// +// // 区域模型 +// $arealist = GeoArea::where('city_code', '510500')->select(); +// +// View::assign('editor', get_system_config('other','editor')); +// View::assign('arealist', $arealist); +// View::assign('merchant', $merchant); +// View::assign('url', $this->url); +// return view(); +// } +// } + /** - * - * 新增 - * + * 添加 */ public function add() { if (request()->isAjax()) { - - $params = get_params(); - - $data['user_id'] = $this->adminInfo['id']; // 操作用户ID - $data['name'] = $params['title']; // 团队名称 - $data['tel'] = $params['phone']; // 联系电话 - $data['mer_id_list'] = json_encode($params['mer_id']); // 已选商户 - - $data['street_id'] = $params['street_id']; // 街道ID - $street = GeoStreet::where('street_id', $data['street_id'])->find(); // 街道数据 - $data['lng'] = $street['lng']; // 经度 - $data['lat'] = $street['lat']; // 纬度 - $area = $street->area; // 区数据 - $data['area_id'] = $area['area_id']; // 区县id - $city = $area->city; // 获取市级 - $data['address'] = $city['city_name'] . $area['area_name'] . $street['street_name']; // 实际地址 - $data['create_time'] = date('Y-m-d H:i:s'); - - // 数据入库 - $res = SupplyChain::create($data); - - // 关联数据入库 - foreach ($params['mer_id'] as $v) { - - $dataLink = [ - 'eb_merchant_id' => $v, // 商户ID - 'user_id' => $data['user_id'], - 'create_time' => $data['create_time'], - ]; - - $res->linkMerchant()->save($dataLink); // 插入关联数据 + $param = get_params(); + $data=$param; + $data['mer_id'] = 4; + $data['status'] = 1; + $data['mer_status'] =1; + $data['rate'] = 3; + $data['spec_type'] = $data['is_attribute'];//规格 0单 1多 + if (!$data['spec_type']) { + if (isset($data['skus']) && count($data['skus']) > 1) throw new ValidateException('单规格商品属性错误'); + } + if($data['spec_type'] == 0){ + $data['attrValue'][0]['price'] = $data['price']; + $data['attrValue'][0]['cost'] = $data['cost']; + $data['attrValue'][0]['ot_price'] = $data['ot_price']; + $data['attrValue'][0]['stock'] = $data['stock']; + $data['attrValue'][0]['bar_code'] = $data['bar_code']; + $data['attrValue'][0]['weight'] = $data['weight']; + $data['attrValue'][0]['volume'] = $data['volume']; + $new_attr = []; } - if ($res){ - return to_assign(0,'操作成功',['aid'=>$res]); + if($data['spec_type'] == 1){ + $new_attr = []; + if($data['attr']){ + $attr = json_decode($data['attr'],1); + foreach ($attr as $k => $v){ + $new_attr[$k]['value'] = $v['title']; + $new_attr[$k]['detail'] = array_column($v['child'],'title'); + } + } + $skus = $data['skus']; + foreach ($skus as $k => $v){ + foreach ($data['kk'] as $key => $val){ + $detail[$val] = $v['value'.$key]; + } + $v['detail'] = $detail; + $new_sku[] = $v; + } + $data['attrValue'] = $new_sku; } - return to_assign(1, '操作失败，原因：'.$res); + unset($data['skus']); + $data['attr'] = $new_attr; + $data['params'] = []; + $data['mer_labels'] = []; + $data['mer_id'] = $this->mer_id; + $content = [ + 'content' => $data['content'] , + 'type' => 0 + ]; + $productType=0; + $conType=0; + + $product = $this->setProduct($data); + $data['mer_cate_id'] = [$data['mer_cate_id']]; + +// halt($data); + // event('product.create.before', compact('data','productType','conType')); + return Db::transaction(function () use ($data, $productType,$conType,$content,$product) { + $activity_id = 0; + $product_id = Db::connect('shop')->table('eb_store_product')->strict(false)->field(true)->insertGetId($product); + $settleParams = $this->setAttrValue($data, $product_id, $productType, 0); + + $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $product_id, $data['mer_id']); + $settleParams['attr'] = $this->setAttr($data['attr'], $product_id); + if ($productType == 0) $this->parameter_create($product_id, $data['params'] ?? [], $data['mer_id']); + $this->save($product_id, $settleParams, $content, $product, $productType); + if (in_array($productType, [0, 1])) { + if ($productType == 1) { //秒杀商品 + $dat = $this->setSeckillProduct($data); + $dat['product_id'] = $product_id; + $seckill = Db::connect('shop')->table('eb_store_seckill_active')->strict(false)->field(true)->insertGetId($dat); + $activity_id = $seckill; + } + $product['price'] = $settleParams['data']['price']; + $product['mer_labels'] = $data['mer_labels']; + $this->setparam($product, $product_id, $activity_id, $productType); + } +// $product = $result; +// event('product.create',compact('product')); +// return $product_id; + return to_assign(0, '操作成功', ['aid' => $product_id]); + }); +// }else{ - // 取出正常的商家 - $merchant = Merchant::where('status', 1)->column('mer_id, real_name'); - - // 区域模型 - $arealist = GeoArea::where('city_code', '510500')->select(); - - View::assign('editor', get_system_config('other','editor')); - View::assign('arealist', $arealist); - View::assign('merchant', $merchant); - View::assign('url', $this->url); + $store_brand= Db::connect('shop')->table('eb_store_brand')->where(['is_show' => 1]) + ->select(); + View::assign('store_brand', $store_brand); return view(); } } + /** + * @Author:Qinii + * @Date: 2020/5/20 + * @param $id + * @param $spec_type + * @param $settleParams + * @param $content + * @return int + */ + public function save($id, $settleParams, $content, $data = [], $productType = 0) + { + + Db::connect('shop')->table('eb_store_product_attr')->where('product_id',$id)->delete(); + Db::connect('shop')->table('eb_store_product_attr_value')->where('product_id',$id)->delete(); + Db::connect('shop')->table('eb_store_product_cate')->where('product_id',$id)->delete(); +// halt($settleParams['cate']); + if (isset($settleParams['cate'])) (Db::connect('shop')->table('eb_store_product_cate')->strict(false)->field(true)->insertAll($settleParams['cate'])); + if (isset($settleParams['attr'])) (Db::connect('shop')->table('eb_store_product_attr')->strict(false)->field(true)->insertAll($settleParams['attr'])); + + if (isset($settleParams['attrValue'])) { + $arr = array_chunk($settleParams['attrValue'], 30); + foreach ($arr as $item){ + Db::connect('shop')->table('eb_store_product_attr_value')->strict(false)->field(true)->insertAll($item); + } + } + if ($content){ + Db::connect('shop')->table('eb_store_product_content')->where('product_id',$id)->delete(); + $content['product_id'] = $id; + Db::connect('shop')->table('eb_store_product_content')->strict(false)->field(true)->insert($content); + } + + if (isset($settleParams['data'])) { + $data['price'] = $settleParams['data']['price']; + $data['ot_price'] = $settleParams['data']['ot_price']; + $data['cost'] = $settleParams['data']['cost']; + $data['stock'] = $settleParams['data']['stock']; + $data['svip_price'] = $settleParams['data']['svip_price']; + } + $res = Db::connect('shop')->table('eb_store_product')->where('product_id',$id)->update($data); + + return $res; + } + + public function parameter_create($id, $data,$merId) + { + if (empty($data)) return ; + foreach ($data as $datum) { + if ($datum['name'] && $datum['value']) { + $create[] = [ + 'product_id' => $id, + 'name' => $datum['name'] , + 'value' => $datum['value'], + 'sort' => $datum['sort'], + 'parameter_id' => $datum['parameter_id'] ?? 0, + 'mer_id' => $datum['mer_id'] ?? $merId, + 'create_time' => date('Y-m-d H:i:s',time()) + ]; + } + } + if ($create) Db::connect('shop')->table('eb_parameter_value')->strict(false)->field(true)->insertAll($create); + } + + public function setparam(array $param, $productId, $activityId, $productType) + { + + $data = [ + 'product_id' => $productId, + 'product_type' => $productType ?? 0, + 'activity_id' => $activityId, + 'store_name' => $param['store_name'], + 'keyword' => $param['keyword'] ?? '', + 'image' => $param['image'], + 'price' => $param['price'], + 'status' => 0, + 'rank' => $param['rank'] ?? 0, + 'temp_id' => $param['temp_id'], + 'sort' => $param['sort'] ?? 0, + 'mer_labels' => $param['mer_labels'] ?? '', + ]; + if (isset($param['mer_id'])) $data['mer_id'] = $param['mer_id']; + Db::connect('shop')->table('eb_store_spu')->strict(false)->field(true)->insert($data); + } + public function adds() + { + if (request()->isAjax()) { + $param = get_params(); + // 检验完整性 + try { + validate(StoreProductValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $param['admin_id'] = $this->uid; + $this->model->addStoreProduct($param); + }else{ + + $store_brand= Db::connect('shop')->table('eb_store_brand')->where(['is_show' => 1]) + ->select(); + View::assign('store_brand', $store_brand); + return view(); + } + } + public function category_arr($id=0){ + $where[]=['is_show','=',1]; + $where[]=['mer_id','=',0]; + if($id!=0){ + $where[1]=['mer_id','=',$id]; + } + $list=Db::connect('shop')->table('eb_store_category')->where($where) + ->field('store_category_id id,pid,cate_name name')->select(); + $category_arr=create_tree_list(0,$list,0); + return to_assign(0,'操作成功', $category_arr); + } + + /** + * 格式商品商户分类 + * @Author:Qinii + * @Date: 2020/9/15 + * @param array $data + * @param int $productId + * @param int $merId + * @return array + */ + public function setMerCate(array $data, int $productId, int $merId) + { + $result = []; + foreach ($data as $value) { + $result[] = [ + 'product_id' => $productId, + 'mer_cate_id' => $value, + 'mer_id' => $merId, + ]; + } + return $result; + } + + + /** + * 格式商品规格 + * @Author:Qinii + * @Date: 2020/9/15 + * @param array $data + * @param int $productId + * @return array + */ + public function setAttr(array $data, int $productId) + { + $result = []; + try{ + foreach ($data as $value) { + $result[] = [ + 'type' => 0, + 'product_id' => $productId, + "attr_name" => $value['value'] ?? $value['attr_name'], + 'attr_values' => implode('-!-', $value['detail']), + ]; + } + } catch (\Exception $exception) { + throw new ValidateException('商品规格格式错误'); + } + + return $result; + } + + /** + * 格式化秒杀商品活动时间 + * @Author:Qinii + * @Date: 2020/9/15 + * @param array $data + * @return array + */ + public function setSeckillProduct(array $data) + { + $dat = [ + 'start_day' => $data['start_day'], + 'end_day' => $data['end_day'], + 'start_time' => $data['start_time'], + 'end_time' => $data['end_time'], + 'status' => 1, + 'once_pay_count' => $data['once_pay_count'], + 'all_pay_count' => $data['all_pay_count'], + ]; + if (isset($data['mer_id'])) $dat['mer_id'] = $data['mer_id']; + return $dat; + } + + /** + * 格式商品主体信息 + * @Author:Qinii + * @Date: 2020/9/15 + * @param array $data + * @return array + */ + public function setProduct(array $data) + { + $give_coupon_ids = ''; + if (isset($data['give_coupon_ids']) && !empty($data['give_coupon_ids'])) { + $gcoupon_ids = array_unique($data['give_coupon_ids']); + $give_coupon_ids = implode(',', $gcoupon_ids); + } + + if(isset($data['integral_rate'])){ + $integral_rate = $data['integral_rate']; + if($data['integral_rate'] < 0) $integral_rate = -1; + if($data['integral_rate'] > 100) $integral_rate = 100; + + } + + $result = [ + 'store_name' => $data['store_name'], + 'image' => $data['image'], +// 'slider_image' => is_array($data['slider_image']) ? implode(',', $data['slider_image']) : '', + 'slider_image' => $data['slider_image'], + 'store_info' => $data['store_info'] ?? '', + 'keyword' => $data['keyword']??'', + 'brand_id' => $data['brand_id'] ?? 0, + 'cate_id' => $data['cate_id'] ?? 0, + 'unit_name' => $data['unit_name']??'件', + 'sort' => $data['sort'] ?? 0, + 'is_show' => $data['is_show'] ?? 0, + 'is_used' => (isset($data['status']) && $data['status'] == 1) ? 1 : 0, + 'is_good' => $data['is_good'] ?? 0, + 'video_link' => $data['video_link']??'', + 'temp_id' => $data['delivery_free'] ? 0 : ($data['temp_id'] ?? 0), + 'extension_type' => $data['extension_type']??0, + 'spec_type' => $data['spec_type'] ?? 0, + 'status' => $data['status']??0, + 'give_coupon_ids' => $give_coupon_ids, + 'mer_status' => $data['mer_status'], + 'guarantee_template_id' => $data['guarantee_template_id']??0, + 'is_gift_bag' => $data['is_gift_bag'] ?? 0, + 'integral_rate' => $integral_rate ?? 0, + 'delivery_way' => implode(',',$data['delivery_way']), + 'delivery_free' => $data['delivery_free'] ?? 0, + 'once_min_count' => $data['once_min_count'] ?? 0, + 'once_max_count' => $data['once_max_count'] ?? 0, + 'pay_limit' => $data['pay_limit'] ?? 0, + 'svip_price_type' => $data['svip_price_type'] ?? 0, + ]; + if (isset($data['mer_id'])) + $result['mer_id'] = $data['mer_id']; + if (isset($data['old_product_id'])) + $result['old_product_id'] = $data['old_product_id']; + if (isset($data['product_type'])) + $result['product_type'] = $data['product_type']; + if (isset($data['type']) && $data['type']) + $result['type'] = $data['type']; + if (isset($data['param_temp_id'])) + $result['param_temp_id'] = $data['param_temp_id']; + if (isset($data['extend'])) + $result['extend'] = $data['extend'] ? json_encode($data['extend'], JSON_UNESCAPED_UNICODE) :[]; + return $result; + } + + /** + * 格式商品SKU + * @Author:Qinii + * @Date: 2020/9/15 + * @param array $data + * @param int $productId + * @return mixed + */ + public function setAttrValue(array $data, int $productId, int $productType, int $isUpdate = 0) + { +// $extension_status = systemConfig('extension_status'); + $extension_status = 0; + if ($isUpdate) { + $product = Db::connect('shop')->table('eb_store_product_attr_value') + ->when(isset($where['product_id']) && $where['product_id'] !== '',function($query)use($where){ + $query->where('product_id',$where['product_id']); + }) + ->when(isset($where['sku']) && $where['sku'] !== '',function($query)use($where){ + $query->where('sku',$where['sku']); + }) + ->when(isset($where['unique']) && $where['unique'] !== '',function($query)use($where){ + $query->where('unique',$where['unique']); + })->select()->toArray(); + $oldSku = $this->detailAttrValue($product, null); + } + $price = $stock = $ot_price = $cost = $svip_price = 0; + try { + foreach ($data['attrValue'] as $value) { + $sku = ''; + if (isset($value['detail']) && !empty($value['detail']) && is_array($value['detail'])) { + $sku = implode(',', $value['detail']); + } + $ot_price_ = $value['price']; + if (isset($value['active_price'])) { + $sprice = $value['active_price'] < 0 ? 0 : $value['active_price']; + } elseif (isset($value['presell_price'])) { + $sprice = $value['presell_price'] < 0 ? 0 : $value['presell_price']; + } elseif (isset($value['assist_price'])) { + $sprice = $value['assist_price'] < 0 ? 0 : $value['assist_price']; + } else { + $ot_price_ = $value['ot_price']; + $sprice = ($value['price'] < 0) ? 0 : $value['price']; + } + if (isset($value['svip_price']) && $data['svip_price_type']) { + $svip_price = !$svip_price ? $value['svip_price'] : (($svip_price > $value['svip_price']) ? $value['svip_price'] : $svip_price); + } + $cost = !$cost ? $value['cost'] : (($cost > $value['cost']) ?$cost: $value['cost']); + $price = !$price ? $sprice : (($price > $sprice) ? $sprice : $price); + $ot_price = !$ot_price ? $ot_price_ : (($ot_price > $ot_price_) ? $ot_price : $ot_price_); + + $unique = $this->setUnique($productId, $sku, $productType); + $result['attrValue'][] = [ + 'detail' => json_encode($value['detail'] ?? ''), + "bar_code" => $value["bar_code"] ?? '', + "image" => $value["image"] ?? '', + "cost" => $value['cost'] ? (($value['cost'] < 0) ? 0 : $value['cost']) : 0, + "price" => $value['price'] ? (($value['price'] < 0) ? 0 : $value['price']) : 0, + "volume" => isset($value['volume']) ? ($value['volume'] ? (($value['volume'] < 0) ? 0 : $value['volume']) : 0) :0, + "weight" => isset($value['weight']) ? ($value['weight'] ? (($value['weight'] < 0) ? 0 : $value['weight']) : 0) :0, + "stock" => $value['stock'] ? (($value['stock'] < 0) ? 0 : $value['stock']) : 0, + "ot_price" => $value['ot_price'] ? (($value['ot_price'] < 0) ? 0 : $value['ot_price']) : 0, + "extension_one" => $extension_status ? ($value['extension_one'] ?? 0) : 0, + "extension_two" => $extension_status ? ($value['extension_two'] ?? 0) : 0, + "product_id" => $productId, + "type" => 0, + "sku" => $sku, + "unique" => $unique, + 'sales' => $isUpdate ? ($oldSku[$sku]['sales'] ?? 0) : 0, + 'svip_price' => $svip_price, + ]; + $stock = $stock + intval($value['stock']); + } + $result['data'] = [ + 'price' => $price , + 'stock' => $stock, + 'ot_price' => $ot_price, + 'cost' => $cost, + 'svip_price' => $svip_price, + ]; + } catch (\Exception $exception) { + throw new ValidateException('规格错误 ：'.$exception->getMessage()); + } + return $result; + } + + /** + * @Author:Qinii + * @Date: 2020/5/11 + * @param int $id + * @param string $sku + * @param int $type + * @return string + */ + public function setUnique(int $id, $sku, int $type) + { + return $unique = substr(md5($sku . $id), 12, 11) . $type; + // $has = (app()->make(ProductAttrValueRepository::class))->merUniqueExists(null, $unique); + // return $has ? false : $unique; + } + + /** + * TODO 单商品sku + * @param $data + * @param $userInfo + * @return array + * @author Qinii + * @day 2020-08-05 + */ + public function detailAttrValue($data, $userInfo, $productType = 0, $artiveId = null, $svipInfo = []) + { + $sku = []; + $make_presll = app()->make(ProductPresellSkuRepository::class); + $make_assist = app()->make(ProductAssistSkuRepository::class); + $make_group = app()->make(ProductGroupSkuRepository::class); + foreach ($data as $value) { + $_value = [ + 'sku' => $value['sku'], + 'price' => $value['price'], + 'stock' => $value['stock'], + 'image' => $value['image'], + 'weight' => $value['weight'], + 'volume' => $value['volume'], + 'sales' => $value['sales'], + 'unique' => $value['unique'], + 'bar_code' => $value['bar_code'], + ]; + if($productType == 0 ){ + $_value['ot_price'] = $value['ot_price']; + $_value['svip_price'] = $value['svip_price']; + } + if ($productType == 2) { + $_sku = $make_presll->getSearch(['product_presell_id' => $artiveId, 'unique' => $value['unique']])->find(); + if (!$_sku) continue; + $_value['price'] = $_sku['presell_price']; + $_value['stock'] = $_sku['stock']; + $_value['down_price'] = $_sku['down_price']; + } + //助力 + if ($productType == 3) { + $_sku = $make_assist->getSearch(['product_assist_id' => $artiveId, 'unique' => $value['unique']])->find(); + if (!$_sku) continue; + $_value['price'] = $_sku['assist_price']; + $_value['stock'] = $_sku['stock']; + } + //拼团 + if ($productType == 4) { + $_sku = $make_group->getSearch(['product_group_id' => $artiveId, 'unique' => $value['unique']])->find(); + if (!$_sku) continue; + $_value['price'] = $_sku['active_price']; + $_value['stock'] = $_sku['stock']; + } + //推广员 + if ($this->getUserIsPromoter($userInfo)) { + $_value['extension_one'] = $value->bc_extension_one; + $_value['extension_two'] = $value->bc_extension_two; + } + $sku[$value['sku']] = $_value; + } + return $sku; + } + /** * * 编辑 @@ -343,15 +861,126 @@ class Product extends BaseController $merchant = Merchant::where('status', 1)->column('mer_id, real_name'); // 区域模型 $arealist = GeoArea::where('city_code', '510500')->select(); - + $store_brand= Db::connect('shop')->table('eb_store_brand')->where(['is_show' => 1]) + ->select(); + View::assign('store_brand', $store_brand); View::assign('arealist', $arealist); View::assign('merchant', $merchant); View::assign('url', $this->url); + $getAdminOneProduct = $this->getAdminOneProduct($id,null); + View::assign('Product', $getAdminOneProduct); return view(); } } + /** + * TODO 后台管理需要的商品详情 + * @param int $id + * @param int|null $activeId + * @return array|\think\Model|null + * @author Qinii + * @day 2020-11-24 + */ + public function getAdminOneProduct(int $id, ?int $activeId, $conType = 0) + { + $with = ['attr', 'attrValue', 'oldAttrValue', 'merCateId.category', 'storeCategory', 'brand', 'temp', 'seckillActive', + 'content' => function($query) use($conType){ + $query->where('type',$conType); + }, + 'merchant'=> function($query){ + $query->field('mer_id,mer_avatar,mer_name,is_trader'); + }, + 'guarantee.templateValue.value', + + ]; + + $data = $this->dao->geTrashedtProduct($id)->with($with)->find(); + + $data['delivery_way'] = empty($data['delivery_way']) ? [2] : explode(',',$data['delivery_way']); + $data['extend'] = empty($data['extend']) ? [] : json_decode($data['extend']); + $make_order = app()->make(StoreCouponRepository::class); + $where = [['coupon_id', 'in', $data['give_coupon_ids']]]; + $data['coupon'] = $make_order->selectWhere($where, 'coupon_id,title')->toArray(); + $spu_make = app()->make(SpuRepository::class); + + $append = []; + if ($data['product_type'] == 0) { + $append = ['us_status', 'params']; + $activeId = 0; + } +// if ($data['product_type'] == 1){ +// $activeId = $data->seckillActive->seckill_active_id; +// $make = app()->make(StoreOrderRepository::class); +// $append = ['us_status','seckill_status']; +// } +// if ($data['product_type'] == 2) $make = app()->make(ProductPresellSkuRepository::class); +// if ($data['product_type'] == 3) $make = app()->make(ProductAssistSkuRepository::class); +// if ($data['product_type'] == 4) $make = app()->make(ProductGroupSkuRepository::class); + + $spu_where = ['activity_id' => $activeId, 'product_type' => $data['product_type'], 'product_id' => $id]; + $spu = $spu_make->getSearch($spu_where)->find(); + $data['star'] = $spu['star'] ?? ''; + $data['mer_labels'] = $spu['mer_labels'] ?? ''; + $data['sys_labels'] = $spu['sys_labels'] ?? ''; + + $data->append($append); + $mer_cat = []; + if (isset($data['merCateId'])) { + foreach ($data['merCateId'] as $i) { + $mer_cat[] = $i['mer_cate_id']; + } + } + $data['mer_cate_id'] = $mer_cat; + + foreach ($data['attr'] as $k => $v) { + $data['attr'][$k] = [ + 'value' => $v['attr_name'], + 'detail' => $v['attr_values'] + ]; + } + $attrValue = (in_array($data['product_type'], [3, 4])) ? $data['oldAttrValue'] : $data['attrValue']; + unset($data['oldAttrValue'], $data['attrValue']); + $arr = []; + if (in_array($data['product_type'], [1, 3])) $value_make = app()->make(ProductAttrValueRepository::class); + foreach ($attrValue as $key => $item) { + +// if ($data['product_type'] == 1) { +// $value = $value_make->getSearch(['sku' => $item['sku'], 'product_id' => $data['old_product_id']])->find(); +// $old_stock = $value['stock']; +// $item['sales'] = $make->skuSalesCount($item['unique']); +// } +// if ($data['product_type'] == 2) { +// $item['presellSku'] = $make->getSearch(['product_presell_id' => $activeId, 'unique' => $item['unique']])->find(); +// if (is_null($item['presellSku'])) continue; +// } +// if ($data['product_type'] == 3) { +// $item['assistSku'] = $make->getSearch(['product_assist_id' => $activeId, 'unique' => $item['unique']])->find(); +// if (is_null($item['assistSku'])) +// continue; +// } +// if ($data['product_type'] == 4) { +// $item['_sku'] = $make->getSearch(['product_group_id' => $activeId, 'unique' => $item['unique']])->find(); +// if (is_null($item['_sku'])) +// continue; +// } + $sku = explode(',', $item['sku']); + $item['old_stock'] = $old_stock ?? $item['stock']; + foreach ($sku as $k => $v) { + $item['value' . $k] = $v; + } + $arr[] = $item; + } + + $data['attrValue'] = $arr; + + $content = $data['content']['content'] ?? ''; + if ($conType) $content = json_decode($content); + unset($data['content']); + $data['content'] = $content; + return $data; + } + /** * * 删除 diff --git a/app/admin/view/product/product/adds.html b/app/admin/view/product/product/adds.html new file mode 100644 index 0000000..dd64f9b --- /dev/null +++ b/app/admin/view/product/product/adds.html @@ -0,0 +1,475 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
商品名称* +
平台商品分类* + +
+ 		品牌选择* + + +
商户分类* + +
+
商品封面图 +
+ +
+ + +
+
+
商品轮播图 +
+ + +
+ +
+
+
单位* +
商品关键字* +
商品简介 + +
+
+
+ + + + + + + +
+ +
+ +
+
+ +
+
+
+ + + + + + +
商品详情 + +
+
+
+ + + + + +
商品推荐 + +
+
+
+ + + + + + + + + + + + + + + + +
送货方式 + + + 是否包邮 + + +
最少购买件数 + + 排序 + +
+
+
+
+
+ + +
+
+{/block} + + + +{block name="script"} + + + +{/block} + \ No newline at end of file diff --git a/app/admin/view/product/product/edit.html b/app/admin/view/product/product/edit.html index 2ebf4e4..a60bbfa 100644 --- a/app/admin/view/product/product/edit.html +++ b/app/admin/view/product/product/edit.html @@ -8,78 +8,221 @@ .editormd li { list-style: inherit; } - .layui-td-gray{ - width: 110px; - } - .addrhelper-ok-btn{ - display: none; - } {/block} {block name="body"}
- -

编辑

- - - - - - - - - - - - +
-
- - - + -
选择商户 -
- -
-
-
-
-
- -
- -
-
- 		-
- -
- - -
-
-
-
- -
- -
-
- 		-
- -
- -
-
-
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
商品名称* +
平台商品分类* + +
+ 		品牌选择* + + +
商户分类* + +
+
商品封面图 +
+ +
+ + +
+
+
商品轮播图 +
+ + +
+ +
+
+
单位* +
商品关键字* +
商品简介 + +
+
+
+ + + + + + + +
+ +
+ +
+
+ +
+
+
+ + + + + + +
商品详情 + +
+
+
+ + + + + +
商品推荐 + +
+
+
+ + + + + + + + + + + + + + + + +
送货方式 + + + 是否包邮 + + +
最少购买件数 + + 排序 + +
+
+
+
@@ -90,99 +233,243 @@ {block name="script"} - - {/block} \ No newline at end of file diff --git a/app/admin/view/product/product/index.html b/app/admin/view/product/product/index.html index 7a9d803..f8b6040 100644 --- a/app/admin/view/product/product/index.html +++ b/app/admin/view/product/product/index.html @@ -161,6 +161,11 @@ +
diff --git a/public/static/assets/gougu/module/skuTable.js b/public/static/assets/gougu/module/skuTable.js index 4c903ad..fd01209 100644 --- a/public/static/assets/gougu/module/skuTable.js +++ b/public/static/assets/gougu/module/skuTable.js @@ -516,7 +516,7 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export table += ''; table += ''; - table += ``; + table += ``; table += `
规格
`; table += ''; table += ''; @@ -575,7 +575,7 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export var theadTr = ''; theadTr += prependThead.map(function (t, i, a) { - return '' + t + ''; + return '' + t + ''; }).join(''); this.options.multipleSkuTableConfig.thead.forEach(function (item) { @@ -615,14 +615,14 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export tr += item.title.split(that.options.skuNameDelimiter).map(function (t, i, a) { if (that.options.rowspan) { if (index % skuRowspanArr[i] === 0 && skuRowspanArr[i] > 1) { - return '' + t + ''; + return '' + t + ''; } else if (skuRowspanArr[i] === 1) { - return '' + t + ''; + return '' + t + ''; } else { return ''; } } else { - return '' + t + ''; + return '' + t + ''; } }).join(''); @@ -710,6 +710,9 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export return 'skus[' + (this.options.skuNameType === 0 ? sku.id : sku.title) + '][' + conf.field + ']'; } + makeSkuName2(sku, conf) { + return 'skus[' + (this.options.skuNameType === 0 ? sku.id : sku.title) + '][' + conf + ']'; + } getSpecData() { return this.options.specData; } @@ -729,7 +732,6 @@ layui.define(['jquery', 'form', 'upload', 'layer', 'sortable'], function (export skuData[key] = value; } }); - return skuData; }