|
|
@@ -45,9 +45,9 @@ class Product extends Controller
|
|
|
if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
|
|
|
if (is_numeric($platform) || $platform) $map[] = ['platform', 'like', "%$platform%"];
|
|
|
// 权限判断
|
|
|
- if ($is_admin != 1 && $company_id != 0){
|
|
|
- $map[] = ['company_id', '=', $company_id];
|
|
|
- }else{
|
|
|
+ if ($is_admin != 1 && $company_id != 0) {
|
|
|
+ $map[] = ['company_id', '=', $company_id];
|
|
|
+ } else {
|
|
|
$map[] = ['company_id', '=', $admin_company_id];
|
|
|
}
|
|
|
// 查询数据
|
|
|
@@ -62,21 +62,22 @@ class Product extends Controller
|
|
|
$result['data'][$key]['platform'] = isset($value['platform']) ? explode(',', $value['platform']) : '';
|
|
|
$product_specs = isset($value['product_specs']) ? explode(',', $value['product_specs']) : '';
|
|
|
//移除空数组
|
|
|
- $result['data'][$key]['product_specs'] = $product_specs ? array_filter($product_specs):'';
|
|
|
+ $result['data'][$key]['product_specs'] = $product_specs ? array_filter($product_specs) : '';
|
|
|
}
|
|
|
}
|
|
|
// 加载模板
|
|
|
return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
+ /**
|
|
|
* 商品名称规格列表
|
|
|
* @author 唐远望
|
|
|
* @version 1.0
|
|
|
* @date 2026-03-25
|
|
|
*
|
|
|
*/
|
|
|
- public function product_name_specs_list(Request $request, ProductModel $ProductModel){
|
|
|
+ public function product_name_specs_list(Request $request, ProductModel $ProductModel)
|
|
|
+ {
|
|
|
|
|
|
$request->scene('product_name_specs_list')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
@@ -96,15 +97,15 @@ class Product extends Controller
|
|
|
if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
|
|
|
if (is_numeric($platform) || $platform) $map[] = ['platform', 'like', "%$platform%"];
|
|
|
// 权限判断
|
|
|
- if ($is_admin != 1 && $company_id != 0){
|
|
|
- $map[] = ['company_id', '=', $company_id];
|
|
|
- }else{
|
|
|
+ if ($is_admin != 1 && $company_id != 0) {
|
|
|
+ $map[] = ['company_id', '=', $company_id];
|
|
|
+ } else {
|
|
|
$map[] = ['company_id', '=', $admin_company_id];
|
|
|
}
|
|
|
// 查询数据
|
|
|
$result = $ProductModel->query()
|
|
|
->where($map)
|
|
|
- ->select(['id','product_name','product_specs'])
|
|
|
+ ->select(['id', 'product_name', 'product_specs'])
|
|
|
->distinct('product_name')
|
|
|
->orderByDesc('id')->get()->toarray();
|
|
|
// 分配数据
|
|
|
@@ -113,7 +114,7 @@ class Product extends Controller
|
|
|
foreach ($result as $key => $value) {
|
|
|
$product_specs = isset($value['product_specs']) ? explode(',', $value['product_specs']) : '';
|
|
|
//移除空数组
|
|
|
- $result[$key]['product_specs'] = $product_specs ? array_filter($product_specs):'';
|
|
|
+ $result[$key]['product_specs'] = $product_specs ? array_filter($product_specs) : '';
|
|
|
}
|
|
|
}
|
|
|
// 加载模板
|
|
|
@@ -148,7 +149,7 @@ class Product extends Controller
|
|
|
$data->platform = isset($data->platform) ? explode(',', $data->platform) : '';
|
|
|
$product_specs = isset($data->product_specs) ? explode(',', $data->product_specs) : '';
|
|
|
//移除空数组
|
|
|
- $data->product_specs = $product_specs ? array_filter($product_specs):'';
|
|
|
+ $data->product_specs = $product_specs ? array_filter($product_specs) : '';
|
|
|
// 加载模板
|
|
|
return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
|
|
|
}
|
|
|
@@ -165,7 +166,7 @@ class Product extends Controller
|
|
|
$request->scene('add')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
- $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
|
|
|
+ $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
//商品启用数量
|
|
|
// $product_count = $ProductModel->where('status', 0)->count();
|
|
|
//判断是否超过限制
|
|
|
@@ -174,10 +175,14 @@ class Product extends Controller
|
|
|
// }
|
|
|
// 接收数据
|
|
|
$all_data = request()->all();
|
|
|
+ $product_brand = request('product_brand', '');
|
|
|
+ $product_keyword = request('product_keyword', '');
|
|
|
+ $all_data['product_brand'] = $product_brand;
|
|
|
+ $all_data['product_keyword'] = $product_keyword;
|
|
|
//采集信息配置
|
|
|
- $enable_full_quantity = request('enable_full_quantity', 1);//全量,0启用,1禁用
|
|
|
+ $enable_full_quantity = request('enable_full_quantity', 1); //全量,0启用,1禁用
|
|
|
$all_data['enable_full_quantity'] = $enable_full_quantity;
|
|
|
- if($enable_full_quantity == 1 && !isset($all_data['product_specs'])){
|
|
|
+ if ($enable_full_quantity == 1 && !isset($all_data['product_specs'])) {
|
|
|
return json_send(['code' => 'error', 'msg' => '非全量采集时,商品规格不能为空']);
|
|
|
}
|
|
|
$minimum_order_quantity = request('minimum_order_quantity', 1);
|
|
|
@@ -209,7 +214,7 @@ class Product extends Controller
|
|
|
$admin_id = request('access_token.uid', 0); //用户ID
|
|
|
$table_name = $ProductModel->getTable();
|
|
|
$notes_type = 1; //操作类型,1添加,2修改,3=删除
|
|
|
- $this->addAdminHistory('采集配置-商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了商品' . $all_data['product_name'] . '信息');
|
|
|
+ $this->addAdminHistory('采集配置-商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了商品' . $all_data['product_name'] . '信息');
|
|
|
// 告知结果
|
|
|
return json_send(['code' => 'success', 'msg' => '新增成功']);
|
|
|
}
|
|
|
@@ -226,15 +231,19 @@ class Product extends Controller
|
|
|
$request->scene('edit')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
- $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
|
|
|
+ $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
// 接收参数
|
|
|
$id = request('id', 0);
|
|
|
// 接收数据
|
|
|
$all_data = request()->all();
|
|
|
+ $product_brand = request('product_brand', '');
|
|
|
+ $product_keyword = request('product_keyword', '');
|
|
|
+ $all_data['product_brand'] = $product_brand;
|
|
|
+ $all_data['product_keyword'] = $product_keyword;
|
|
|
//采集信息配置
|
|
|
- $enable_full_quantity = request('enable_full_quantity', 1);//全量,0启用,1禁用
|
|
|
+ $enable_full_quantity = request('enable_full_quantity', 1); //全量,0启用,1禁用
|
|
|
$all_data['enable_full_quantity'] = $enable_full_quantity;
|
|
|
- if($enable_full_quantity == 1 && !isset($all_data['product_specs'])){
|
|
|
+ if ($enable_full_quantity == 1 && !isset($all_data['product_specs'])) {
|
|
|
return json_send(['code' => 'error', 'msg' => '非全量采集时,商品规格不能为空']);
|
|
|
}
|
|
|
$minimum_order_quantity = request('minimum_order_quantity', 1);
|
|
|
@@ -259,9 +268,9 @@ class Product extends Controller
|
|
|
// 更新数据表
|
|
|
$where = ['id' => $id];
|
|
|
// 权限判断
|
|
|
- if ($is_admin != 1 && $company_id != 0){
|
|
|
- $where['company_id'] = $company_id;
|
|
|
- }else{
|
|
|
+ if ($is_admin != 1 && $company_id != 0) {
|
|
|
+ $where['company_id'] = $company_id;
|
|
|
+ } else {
|
|
|
$where['company_id'] = $admin_company_id;
|
|
|
}
|
|
|
$Product = $ProductModel->where($where)->first();
|
|
|
@@ -274,7 +283,7 @@ class Product extends Controller
|
|
|
$admin_id = request('access_token.uid', 0); //用户ID
|
|
|
$table_name = $ProductModel->getTable();
|
|
|
$notes_type = 2; //操作类型,1添加,2修改,3=删除
|
|
|
- $this->addAdminHistory('采集配置-商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了商品' . $oldData['product_name'] . '信息');
|
|
|
+ $this->addAdminHistory('采集配置-商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了商品' . $oldData['product_name'] . '信息');
|
|
|
// 告知结果
|
|
|
return json_send(['code' => 'success', 'msg' => '修改成功']);
|
|
|
}
|
|
|
@@ -292,7 +301,7 @@ class Product extends Controller
|
|
|
$request->scene('set_status')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
- $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
|
|
|
+ $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
// 接收数据
|
|
|
$id = request('id', 0);
|
|
|
$status = request('status', 0);
|
|
|
@@ -306,9 +315,9 @@ class Product extends Controller
|
|
|
}
|
|
|
// 查询用户
|
|
|
$where = ['id' => $id];
|
|
|
- if ($is_admin != 1 && $company_id != 0){
|
|
|
- $where['company_id'] = $company_id;
|
|
|
- }else{
|
|
|
+ if ($is_admin != 1 && $company_id != 0) {
|
|
|
+ $where['company_id'] = $company_id;
|
|
|
+ } else {
|
|
|
$where['company_id'] = $admin_company_id;
|
|
|
}
|
|
|
$Product = $ProductModel->where($where)->first();
|
|
|
@@ -321,7 +330,7 @@ class Product extends Controller
|
|
|
$admin_id = request('access_token.uid', 0); //用户ID
|
|
|
$table_name = $ProductModel->getTable();
|
|
|
$notes_type = 2; //操作类型,1添加,2修改,3=删除
|
|
|
- $this->addAdminHistory('采集配置-商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了商品' . $Product->product_name . '状态');
|
|
|
+ $this->addAdminHistory('采集配置-商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了商品' . $Product->product_name . '状态');
|
|
|
// 告知结果
|
|
|
return json_send(['code' => 'success', 'msg' => '设置成功']);
|
|
|
}
|
|
|
@@ -340,14 +349,14 @@ class Product extends Controller
|
|
|
$request->scene('delete')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
- $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
|
|
|
+ $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
|
// 接收数据
|
|
|
$id = request('id', 0);
|
|
|
// 查询用户
|
|
|
$where = ['id' => $id];
|
|
|
- if ($is_admin != 1 && $company_id != 0){
|
|
|
- $where['company_id'] = $company_id;
|
|
|
- }else{
|
|
|
+ if ($is_admin != 1 && $company_id != 0) {
|
|
|
+ $where['company_id'] = $company_id;
|
|
|
+ } else {
|
|
|
$where['company_id'] = $admin_company_id;
|
|
|
}
|
|
|
// 执行删除
|
|
|
@@ -362,7 +371,7 @@ class Product extends Controller
|
|
|
$admin_id = request('access_token.uid', 0); //用户ID
|
|
|
$table_name = $ProductModel->getTable();
|
|
|
$notes_type = 3; //操作类型,1添加,2修改,3=删除
|
|
|
- $this->addAdminHistory('采集配置-商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $Product->toarray(), [], '删除了商品' . $Product->product_name . '信息');
|
|
|
+ $this->addAdminHistory('采集配置-商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $Product->toarray(), [], '删除了商品' . $Product->product_name . '信息');
|
|
|
// 告知结果
|
|
|
DB::commit();
|
|
|
return json_send(['code' => 'success', 'msg' => '删除成功']);
|