From 8df482d949ae69becdc750572db1daf381feb880 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 17:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/product/Product.php | 431 ++++++++++++------- app/admin/view/product/product/adds.html | 10 +- app/admin/view/product/product/edit.html | 69 ++- app/admin/view/product/product/index.html | 6 +- app/admin/view/product/product/read.html | 500 ++++++++++++++++++++++ 5 files changed, 839 insertions(+), 177 deletions(-) create mode 100644 app/admin/view/product/product/read.html diff --git a/app/admin/controller/product/Product.php b/app/admin/controller/product/Product.php index e83deee..1eeea6b 100644 --- a/app/admin/controller/product/Product.php +++ b/app/admin/controller/product/Product.php @@ -46,7 +46,7 @@ class Product extends BaseController '/admin/product.product/adds', '/admin/product.product/edit', '/admin/product.product/delete', - '/admin/product.product/index', + '/admin/product.product/read', ]; } @@ -281,6 +281,7 @@ class Product extends BaseController if (request()->isAjax()) { $param = get_params(); $data=$param; + halt($data); $data['mer_id'] = 4; $data['status'] = 1; $data['mer_status'] =1; @@ -641,6 +642,7 @@ class Product extends BaseController // $extension_status = systemConfig('extension_status'); $extension_status = 0; if ($isUpdate) { + $where = ['product_id' => $productId]; $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']); @@ -739,9 +741,9 @@ class Product extends BaseController 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); +// $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'], @@ -758,32 +760,32 @@ class Product extends BaseController $_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 ($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; - } +// if ($this->getUserIsPromoter($userInfo)) { +// $_value['extension_one'] = $value->bc_extension_one; +// $_value['extension_two'] = $value->bc_extension_two; +// } $sku[$value['sku']] = $_value; } return $sku; @@ -801,56 +803,67 @@ class Product extends BaseController if (request()->isAjax()) { - $params = get_params(); + $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('单规格商品属性错误'); + } - $data['id'] = $params['id']; // 当前ID - $data['user_id'] = $this->adminInfo['id']; // 操作用户ID - $data['name'] = $params['title']; // 团队名称 - $data['tel'] = $params['phone']; // 联系电话 - $data['mer_id_list'] = isset($params['mer_id']) ? json_encode($params['mer_id']) : null; // 已选商户 - $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'); - - // 数据更新 - $supplyChain = SupplyChain::with(['linkMerchant'])->find($data['id']); - $res = $supplyChain->update($data); - - // 获取关联数据一对一---曲线救国 - $linkMerchant = $supplyChain['linkMerchant']; - // $linkMerchantArr = $linkMerchant->column('id'); + if($data['spec_type'] == 0){ + $attr_data[0]['price'] = $data['price']; + $attr_data[0]['cost'] = $data['cost']; + $attr_data[0]['ot_price'] = $data['ot_price']; + $attr_data[0]['stock'] = $data['stock']; + $attr_data[0]['bar_code'] = $data['bar_code']; + $attr_data[0]['weight'] = $data['weight']; + $attr_data[0]['volume'] = $data['volume']; + $new_attr = []; + $data['attrValue'] = $attr_data; + } - // 先删除关联数据-- 曲线救国 - $linkMerchant->delete(); - - // 关联商户状态 - if($data['mer_id_list']) - { - // 再重新将关联数据入库 - foreach ($params['mer_id'] as $v) { - - $dataLink = [ - 'eb_merchant_id' => $v, // 商户ID - 'user_id' => $data['user_id'], - 'create_time' => $data['create_time'], - ]; - - $supplyChain->linkMerchant()->save($dataLink); +// halt($data); + 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; } - if ($res){ - return to_assign(0,'操作成功',['aid'=>$res]); - } + unset($data['skus']); + $data['attr'] = $new_attr; + $data['params'] = []; + $data['mer_labels'] = []; + $data['mer_id'] = $this->mer_id; - return to_assign(1, '操作失败，原因：'.$res); + $content = [ + 'content' => $data['content'] , + 'type' => 0 + ]; + $productType=0; + $conType=0; + $product = $this->setProduct($data); + $data['mer_cate_id'] = [$data['mer_cate_id']]; + $this->edit_product($id, $data, $this->mer_id, 0); + to_assign(0, '操作成功!'); }else{ $supplyChain = SupplyChain::with(['merchant', 'street', 'area'])->find($id); // 取出当前供应链数据 @@ -867,13 +880,100 @@ class Product extends BaseController View::assign('arealist', $arealist); View::assign('merchant', $merchant); View::assign('url', $this->url); - $getAdminOneProduct = $this->getAdminOneProduct($id,null); - View::assign('Product', $getAdminOneProduct); + $getAdminOneProduct = $this->getAdminOneProduct((int)$id,null); +//dump($getAdminOneProduct); + View::assign('product', $getAdminOneProduct); return view(); } } + public function edit_product(int $id, array $data, int $merId, int $productType, $conType = 0) + { + if (!$data['spec_type']) { + $data['attr'] = []; + if (count($data['attrValue']) > 1) throw new ValidateException('单规格商品属性错误'); + } + $spuData = $product = $this->setProduct($data); + $settleParams = $this->setAttrValue($data, $id, $productType, 1); + $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $id, $merId); + $settleParams['attr'] = $this->setAttr($data['attr'], $id); + $content = [ + 'content' => $conType ? json_encode($data['content']) : $data['content'] , + 'type' => $conType + ]; + $spuData['price'] = $settleParams['data']['price']; + $spuData['mer_id'] = $merId; + $spuData['mer_labels'] = $data['mer_labels']; + + Db::transaction(function () use ($id, $data, $productType, $settleParams,$content,$product,$spuData,$merId) { + $this->save($id, $settleParams, $content, $product, $productType); +// if ($productType == 1) { //秒杀商品 +// $dat = $this->setSeckillProduct($data); +// app()->make(StoreSeckillActiveRepository::class)->updateByProduct($id, $dat); +// } + if ($productType == 0) { + $make = Db::connect('shop')->table('eb_parameter_value'); + $make->where('product_id',$id)->delete(); + $this->parameter_create($id, $data['params'] ?? [], $data['mer_id']); + } + $this->baseUpdate($spuData, $id, 0, $productType); + }); + } + + public function baseUpdate(array $param, int $productId, int $activityId, $productType = 0) + { +// if ($productType == 1) { +// $make = app()->make(StoreSeckillActiveRepository::class); +// $activityId = $make->getSearch(['product_id' => $productId])->value('seckill_active_id'); +// } + $where = [ + 'product_id' => $productId, + 'activity_id' => $activityId, + 'product_type' => $productType, + ]; + $ret = Db::connect('shop')->table('eb_store_spu')->where($where)->find(); + if (!$ret) { + $this->setparam($param, $productId, $activityId, $productType); + + } else { + $data = $this->setparams($param, $productId, $activityId, $productType); + + $value = $data['mer_labels']; + if (!empty($value)) { + if (!is_array($value)) { + $data['mer_labels'] = ',' . $value . ','; + } else { + $data['mer_labels'] = ',' . implode(',', $value) . ','; + } + } + return Db::connect('shop')->table('eb_store_spu')->where($where)->update($data); + } + } + + public function setparams(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']; + return $data; + } + + + /** * TODO 后台管理需要的商品详情 * @param int $id @@ -884,100 +984,118 @@ class Product extends BaseController */ 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 = Db::connect('shop')->table('eb_store_product')->where('product_id',$id)->field('product_id,mer_id,store_name,store_info,keyword,brand_id,cate_id,unit_name,sort,sales,price,cost,ot_price,stock,is_good,product_type,spec_type,extension_type,image,slider_image,once_min_count,delivery_way,delivery_free,pay_limit')->find(); $data['delivery_way'] = empty($data['delivery_way']) ? [2] : explode(',',$data['delivery_way']); + if(in_array('1',$data['delivery_way'])){ + $data['delivery_way1'] = 1; + }else{ + $data['delivery_way1'] = 0; + } + if(in_array('2',$data['delivery_way'])){ + $data['delivery_way2'] = 1; + }else{ + $data['delivery_way2'] = 0; + } $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); + $data['slider_image_arr'] = explode(',',$data['slider_image']); + $data['attr'] = Db::connect('shop')->table('eb_store_product_attr')->where('product_id',$id)->select()->toArray(); + $data['attrValue'] = Db::connect('shop')->table('eb_store_product_attr_value')->where('product_id',$id)->select()->toArray(); $spu_where = ['activity_id' => $activeId, 'product_type' => $data['product_type'], 'product_id' => $id]; - $spu = $spu_make->getSearch($spu_where)->find(); + $spu = Db::connect('shop')->table('eb_store_spu')->where($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; + $data['mer_cate_id'] = Db::connect('shop')->table('eb_store_product_cate')->where('product_id',$id)->value('mer_cate_id'); + + if($data['attr']){ + $child_id = 1; + foreach ($data['attr'] as $k => $v) { + if(strpos($v['attr_values'],'-!-') !== false){ + $attr_values = explode('-!-',$v['attr_values']); + foreach ($attr_values as $key =>$val){ + $child[]= [ + 'id' => $child_id, + 'title' => $val, + 'checked' => true + ]; + $child_id++; + } + }else{ + $child[]= [ + 'id' => $child_id, + 'title' => $v['attr_values'], + 'checked' => true + ]; + } + $data['attr'][$k] = [ + 'id' => $k+1, + 'title' => $v['attr_name'], + 'child' => $child + ]; + unset($child); + $child_id++; + } + $product_attr = $data['attr']; + $data['attr'] = htmlspecialchars_decode(json_encode($data['attr'],JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES)); - 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); + $code = ''; 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; + + if($data['attr']){ + foreach ($product_attr as $kk => $vv){ + foreach ($vv['child'] as $key =>$val){ + if($val['title'] == $item['value0']){ + $code = $val['id'].'-'; + } + if($val['title'] == $item['value1']){ + $code .= $val['id']; + } + } + } + $arr['skus['.$code.'][image]'] = $item['image']; + $arr['skus['.$code.'][price]']= $item['price']; + $arr['skus['.$code.'][ot_price]'] = $item['ot_price']; + $arr['skus['.$code.'][cost]'] = $item['cost']; + $arr['skus['.$code.'][stock]'] = $item['stock']; + $arr['skus['.$code.'][bar_code]'] = $item['bar_code']; + $arr['skus['.$code.'][weight]'] = $item['weight']; + $arr['skus['.$code.'][volume]'] = $item['volume']; + + }else{ + $data['attr'] = json_encode($data['attr']); + $arr['image'] = $item['image']; + $arr['price']= $item['price']; + $arr['ot_price'] = $item['ot_price']; + $arr['cost'] = $item['cost']; + $arr['stock'] = $item['stock']; + $arr['bar_code'] = $item['bar_code']; + $arr['weight'] = $item['weight']; + $arr['volume'] = $item['volume']; + } + } - $data['attrValue'] = $arr; + $data['attrValue'] = htmlspecialchars_decode(json_encode($arr,JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES)); + $data['content'] = Db::connect('shop')->table('eb_store_product_content')->where('product_id',$id)->value('content'); - $content = $data['content']['content'] ?? ''; - if ($conType) $content = json_decode($content); - unset($data['content']); - $data['content'] = $content; +// halt($data); return $data; } @@ -991,10 +1109,10 @@ class Product extends BaseController $id = get_params("id"); if(!$id) return to_assign(1, '非法操作!'); - $supplyChain = SupplyChain::with(['linkMerchant'])->find($id); - // 删除关联模型 - $res = $supplyChain->together(['linkMerchant'])->delete(); - +// $supplyChain = SupplyChain::with(['linkMerchant'])->find($id); +// // 删除关联模型 +// $res = $supplyChain->together(['linkMerchant'])->delete(); + $res = Db::connect('shop')->table('eb_store_product')->where('product_id',$id)->delete(); if ($res){ return to_assign(0,'操作成功',['aid'=>$res]); } @@ -1002,5 +1120,28 @@ class Product extends BaseController return to_assign(1, '操作失败，原因：'.$res); } + + public function read(){ + $id = get_params("id"); + if(!$id) return to_assign(1, '非法操作!'); + $supplyChain = SupplyChain::with(['merchant', 'street', 'area'])->find($id); // 取出当前供应链数据 + + View::assign('detail', $supplyChain); + + // 取出正常的商家 + $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((int)$id,null); +//dump($getAdminOneProduct); + View::assign('product', $getAdminOneProduct); + return view(); + } } \ No newline at end of file diff --git a/app/admin/view/product/product/adds.html b/app/admin/view/product/product/adds.html index dd64f9b..b6dbbbd 100644 --- a/app/admin/view/product/product/adds.html +++ b/app/admin/view/product/product/adds.html @@ -13,6 +13,7 @@ {block name="body"}
+

添加

@@ -98,19 +106,19 @@ 单位* + autocomplete="off" placeholder="请输入单位" class="layui-input" value="{$product.unit_name}"> 商品关键字* + autocomplete="off" placeholder="请输入商品关键字" class="layui-input" value="{$product.keyword}"> 商品简介 - + +{block name="body"} + +

查看

+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
商品名称* +
平台商品分类* + +
+ 		品牌选择* + + +
商户分类* + +
+
商品封面图 +
+ +
+ + +
+
+
商品轮播图 +
+ + +
+ {volist name='$product.slider_image_arr' id='vo'} + {if $vo} + + {/if} + {/volist} + +
+
+
单位* +
商品关键字* +
商品简介 + +
+
+
+ + + + + + + +
+ +
+ +
+
+ +
+
+
+ + + + + + +
商品详情 + +
+
+
+ + + + + +
商品推荐 + +
+
+
+ + + + + + + + + + + + + + + + +
送货方式 + + + 是否包邮 + + +
最少购买件数 + + 排序 + +
+
+
+
+ + + + + +
+{/block} + + + +{block name="script"} + + +{/block} + \ No newline at end of file