WIN-2308041133\Administrator 4 月之前
父节点
当前提交
e542e157a4

+ 8 - 0
app/common/model/store/product/Product.php

@@ -645,6 +645,14 @@ class Product extends BaseModel
     {
         $query->where('is_used', $value);
     }
+    public function searchIsOil($query, $value)
+    {
+        $query->where('is_oil', $value);
+    }
+    public function searchIsGift($query, $value)
+    {
+        $query->where('is_gift', $value);
+    }
 
     public function searchProductTypeAttr($query, $value)
     {

+ 2 - 2
app/common/repositories/store/product/ProductRepository.php

@@ -99,8 +99,8 @@ class ProductRepository extends BaseRepository
         'is_oil',
         'is_gift'
     ];
-    protected $admin_filed = 'Product.product_id,Product.mer_id,brand_id,spec_type,unit_name,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,U.rank,Product.is_show,Product.sales,Product.price,extension_type,refusal,Product.cost,Product.ot_price,Product.stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,star,ficti,integral_total,integral_price_total,sys_labels,Product.param_temp_id,Product.custom_temp_id,Product.mer_svip_status,Product.svip_price,Product.svip_price_type,Product.mer_form_id,Product.good_ids,mer_form_id';
-    protected $filed = 'Product.product_id,Product.mer_id,brand_id,unit_name,spec_type,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,Product.ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,integral_total,integral_price_total,mer_labels,Product.is_good,Product.is_del,Product.type,Product.param_temp_id,Product.custom_temp_id,Product.mer_svip_status,Product.svip_price,Product.svip_price_type,Product.mer_form_id,Product.good_ids,spu_id,video_link,mer_form_id';
+    protected $admin_filed = 'Product.product_id,Product.mer_id,brand_id,spec_type,unit_name,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,U.rank,Product.is_show,Product.sales,Product.price,extension_type,refusal,Product.cost,Product.ot_price,Product.stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,star,ficti,integral_total,integral_price_total,sys_labels,Product.param_temp_id,Product.custom_temp_id,Product.mer_svip_status,Product.svip_price,Product.svip_price_type,Product.mer_form_id,Product.good_ids,mer_form_id,Product.is_oil,Product.is_gift';
+    protected $filed = 'Product.product_id,Product.mer_id,brand_id,unit_name,spec_type,mer_status,rate,reply_count,store_info,cate_id,Product.image,slider_image,Product.store_name,Product.keyword,Product.sort,Product.is_show,Product.sales,Product.price,extension_type,refusal,cost,Product.ot_price,stock,is_gift_bag,Product.care_count,Product.status,is_used,Product.create_time,Product.product_type,old_product_id,integral_total,integral_price_total,mer_labels,Product.is_good,Product.is_del,Product.type,Product.param_temp_id,Product.custom_temp_id,Product.mer_svip_status,Product.svip_price,Product.svip_price_type,Product.mer_form_id,Product.good_ids,spu_id,video_link,mer_form_id,Product.is_oil,Product.is_gift';
 
     const  NOTIC_MSG = [
         1 => [

+ 1 - 0
app/controller/merchant/store/product/Product.php

@@ -73,6 +73,7 @@ class Product extends BaseController
             'mer_form_id',
             'cate_hot'
         ]);
+
         // 根据类型和商家ID获取查询条件
         $where = array_merge($where, $this->repository->switchType($type, $this->request->merId(), 0));
         // 调用仓库方法获取列表数据并返回JSON格式的响应