[智价云] 增加品牌名称信息

app/Http/Controllers/Manager/Process/LowPriceGoods.php

@@ -70,6 +70,7 @@ class LowPriceGoods extends Controller
         $city_ids = request('city_ids', '');
         $shipment_province_ids = request('shipment_province_ids', '');
         $shipment_city_ids = request('shipment_city_ids', '');
+        $product_brand = request('product_brand', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -81,6 +82,8 @@ class LowPriceGoods extends Controller
         if ($id) $map[] = ['id', '=', $id];
         if ($online_posting_cunt) $map[] = ['online_posting_count', '=', $online_posting_cunt];
         if ($continuous_listing_count) $map[] = ['continuous_listing_count', '=', $continuous_listing_count];
+        if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
+
 
         $low_price_goods_where = [];
         // 权限判断
@@ -250,6 +253,7 @@ class LowPriceGoods extends Controller
         $message_data['city_ids'] = request('city_ids', '');
         $message_data['shipment_province_ids'] = request('shipment_province_ids', '');
         $message_data['shipment_city_ids'] = request('shipment_city_ids', '');
+        $message_data['product_brand'] = request('product_brand', '');
 
         $low_price_goods_where = [];
         // 权限判断
@@ -288,6 +292,7 @@ class LowPriceGoods extends Controller
         $city_ids = $message_data['city_ids'] ?? '';
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
+        $product_brand = $message_data['product_brand'] ?? '';
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -295,6 +300,7 @@ class LowPriceGoods extends Controller
         if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
         if ($store_name) $map[]   = ['store_name', 'like', "%$store_name%"];
         if ($category_name) $map[] = ['category_name', 'like', "%$category_name%"];
+        if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
 
 
         $admin_company_id = $message_data['admin_company_id'];

app/Http/Controllers/Manager/Process/ViolationProduct.php

@@ -69,6 +69,7 @@ class ViolationProduct extends Controller
         $city_ids = request('city_ids', '');
         $shipment_province_ids = request('shipment_province_ids', '');
         $shipment_city_ids = request('shipment_city_ids', '');
+        $product_brand = request('product_brand', '');
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -80,6 +81,7 @@ class ViolationProduct extends Controller
         if ($id) $map[] = ['id', '=', $id];
         if ($online_posting_cunt) $map[] = ['online_posting_count', '=', $online_posting_cunt];
         if ($continuous_listing_count) $map[] = ['continuous_listing_count', '=', $continuous_listing_count];
+        if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
 
         $violation_product_where = [];
         // 权限判断
@@ -250,6 +252,7 @@ class ViolationProduct extends Controller
         $message_data['city_ids'] = request('city_ids', '');
         $message_data['shipment_province_ids'] = request('shipment_province_ids', '');
         $message_data['shipment_city_ids'] = request('shipment_city_ids', '');
+        $message_data['product_brand'] = request('product_brand', '');
 
         $violation_product_where = [];
         // 权限判断
@@ -291,6 +294,7 @@ class ViolationProduct extends Controller
         $city_ids = $message_data['city_ids'] ?? '';
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
+        $product_brand = $message_data['product_brand'];
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -298,6 +302,7 @@ class ViolationProduct extends Controller
         if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
         if ($store_name) $map[]   = ['store_name', 'like', "%$store_name%"];
         if ($category_name) $map[] = ['category_name', 'like', "%$category_name%"];
+        if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
 
         $violation_product_where = [];
         // 权限判断

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -112,6 +112,8 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $city_ids = $message_data['city_ids'] ?? '';
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
+        $product_brand = $message_data['product_brand'] ?? '';
+
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -119,6 +121,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
         if ($store_name) $map[]   = ['store_name', 'like', "%$store_name%"];
         if ($category_name) $map[] = ['category_name', 'like', "%$category_name%"];
+        if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
 
         $low_price_goods_where = [];
         // 权限判断

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -109,6 +109,7 @@ class ExportViolationProductJobs implements ShouldQueue
         $city_ids = $message_data['city_ids'] ?? '';
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
+        $product_brand = $message_data['product_brand'];
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -116,6 +117,7 @@ class ExportViolationProductJobs implements ShouldQueue
         if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
         if ($store_name) $map[]   = ['store_name', 'like', "%$store_name%"];
         if ($category_name) $map[] = ['category_name', 'like', "%$category_name%"];
+        if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
 
         $violation_product_where = [];
         // 权限判断

app/Jobs/Manager/Process/LowPriceGoodsDataJobs.php

@@ -172,6 +172,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 'platform'    => $product_data['platform_id'],
                 'company_name'    => $product_data['company_name'],
                 'social_credit_code' => $product_data['qualification_number'],
+                'product_brand'    => $product_data['product_brand'],
                 'product_name'    => $product_name,
                 'product_specs'    => $product_specs,
                 'inventory'    => $product_data['inventory'] ? $product_data['inventory'] : '',

app/Jobs/Manager/Process/ViolationProductDataJobs.php

@@ -163,6 +163,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 'source_id' => $product_data['id'],
                 'platform'    => $product_data['platform_id'],
                 'company_name'    => $product_data['company_name'],
+                'product_brand'    => $product_data['product_brand'],
                 'product_name'    => $product_name,
                 'product_specs'    => $product_specs,
                 'inventory'    => $product_data['inventory'] ? $product_data['inventory'] : '',

app/Models/Manager/Process/LowPriceGoods.php

@@ -65,22 +65,36 @@ class LowPriceGoods extends Model
     {
         $insert_data = [
             'company_id' => $data['company_id'],
-            'first_responsible_person' => $data['first_responsible_person'],
-            'responsible_person' => $data['responsible_person'],
+            'source_id' => $data['source_id'],
+            'first_responsible_person' => $data['first_responsible_person'] ? ',' . $data['first_responsible_person'] . ',' : '',
+            'responsible_person' => $data['responsible_person'] ? ',' . $data['responsible_person'] . ',' : '',
             'platform'    => $data['platform'],
             'company_name'    => $data['company_name'],
+            'product_brand'   => $data['product_brand'],
             'product_name'    => $data['product_name'],
             'product_specs'    => $data['product_specs'],
             'suggested_price'    => $data['suggested_price'],
             'online_posting_price'    => $data['online_posting_price'],
             'online_posting_count'    => isset($data['online_posting_count']) && is_numeric($data['online_posting_count']) ? $data['online_posting_count'] : 1,
             'continuous_listing_count'    => isset($data['continuous_listing_count']) && is_numeric($data['continuous_listing_count']) ? $data['continuous_listing_count'] : 1,
+            'social_credit_code'    => $data['social_credit_code'],
+            'province_id'    => $data['province_id'],
+            'province_name'    => $data['province_name'],
+            'city_id'    => $data['city_id'],
+            'city_name'    => $data['city_name'],
+            'area_info' => $data['area_info'],
             'link_url'    => $data['link_url'],
             'store_name'    => $data['store_name'],
-            'source_responsible_person'    => $data['source_responsible_person'],
+            'source_responsible_person'    => $data['source_responsible_person'] ? ',' . $data['source_responsible_person'] . ',' : '',
+            'category_name' => $data['category_name'],
+            'company_category_name' => $data['company_category_name'],
             'processing_status' => '1',
             'insert_time' => time(),
             'scrape_date' => isset($data['scrape_date']) ? $data['scrape_date'] : '',
+            'shipment_province_id' => isset($data['shipment_province_id']) ? $data['shipment_province_id'] : '0', // 发货省份id
+            'shipment_province_name' => isset($data['shipment_province_name']) ? $data['shipment_province_name'] : '', // 发货省份
+            'shipment_city_id' => isset($data['shipment_city_id']) ? $data['shipment_city_id'] : '0', // 发货城市id
+            'shipment_city_name' => isset($data['shipment_city_name']) ? $data['shipment_city_name'] : '', // 发货城市
         ];
         $LowPriceGoods_id = $this->insertGetId($insert_data);
         return $LowPriceGoods_id;
@@ -103,6 +117,7 @@ class LowPriceGoods extends Model
             $source_where[] = ['product_name', '=', $data['product_name']];
             $source_where[] = ['product_specs', '=', $data['product_specs']];
             $source_where[] = ['suggested_price', '=', $data['suggested_price']];
+            $source_where[] = ['product_brand', '=', $data['product_brand']];
             $source_id_log = $this->where($source_where)->count();
             if ($source_id_log > 0) {
                 return true;
@@ -118,6 +133,7 @@ class LowPriceGoods extends Model
                 'responsible_person' => $data['responsible_person'] ? ',' . $data['responsible_person'] . ',' : '',
                 'platform'    => $data['platform'],
                 'company_name'    => $data['company_name'],
+                'product_brand'   => $data['product_brand'],
                 'product_name'    => $data['product_name'],
                 'product_specs'    => $data['product_specs'],
                 'suggested_price'    => $data['suggested_price'],
@@ -138,10 +154,10 @@ class LowPriceGoods extends Model
                 'processing_status' => '1',
                 'insert_time' => time(),
                 'scrape_date' => isset($data['scrape_date']) ? $data['scrape_date'] : '',
-                'shipment_province_id'=> isset($data['shipment_province_id']) ? $data['shipment_province_id'] : '0', // 发货省份id
-                'shipment_province_name'=> isset($data['shipment_province_name']) ? $data['shipment_province_name'] : '', // 发货省份
-                'shipment_city_id'=> isset($data['shipment_city_id']) ? $data['shipment_city_id'] : '0', // 发货城市id
-                'shipment_city_name'=> isset($data['shipment_city_name']) ? $data['shipment_city_name'] : '', // 发货城市
+                'shipment_province_id' => isset($data['shipment_province_id']) ? $data['shipment_province_id'] : '0', // 发货省份id
+                'shipment_province_name' => isset($data['shipment_province_name']) ? $data['shipment_province_name'] : '', // 发货省份
+                'shipment_city_id' => isset($data['shipment_city_id']) ? $data['shipment_city_id'] : '0', // 发货城市id
+                'shipment_city_name' => isset($data['shipment_city_name']) ? $data['shipment_city_name'] : '', // 发货城市
             ];
 
             $LowPriceGoods_id = $this->insertGetId($insert_data);

app/Models/Manager/Process/ViolationProduct.php

@@ -64,20 +64,33 @@ class ViolationProduct extends Model
         $insert_data = [
             'company_id' => $data['company_id'],
             'source_id' => $data['source_id'],
-            'first_responsible_person' => $data['first_responsible_person'],
-            'responsible_person' => $data['responsible_person'],
+            'first_responsible_person' => $data['first_responsible_person'] ? ',' . $data['first_responsible_person'] . ',' : '',
+            'responsible_person' => $data['responsible_person'] ? ',' . $data['responsible_person'] . ',' : '',
             'platform'    => $data['platform'],
             'company_name'    => $data['company_name'],
+            'product_brand'   => $data['product_brand'],
             'product_name'    => $data['product_name'],
             'product_specs'    => $data['product_specs'],
             'online_posting_count'    => isset($data['online_posting_count']) && is_numeric($data['online_posting_count']) ? $data['online_posting_count'] : 1,
             'continuous_listing_count'    => isset($data['continuous_listing_count']) && is_numeric($data['continuous_listing_count']) ? $data['continuous_listing_count'] : 1,
+            'social_credit_code'    => $data['social_credit_code'],
+            'province_id'    => $data['province_id'],
+            'province_name'    => $data['province_name'],
+            'city_id'    => $data['city_id'],
+            'city_name'    => $data['city_name'],
+            'area_info' => $data['area_info'],
             'link_url'    => $data['link_url'],
             'store_name'    => $data['store_name'],
-            'source_responsible_person'    => $data['source_responsible_person'],
+            'source_responsible_person'    => $data['source_responsible_person'] ? ',' . $data['source_responsible_person'] . ',' : '',
+            'category_name' => $data['category_name'],
+            'company_category_name' => $data['company_category_name'],
             'processing_status' => '1',
             'insert_time' => time(),
             'scrape_date' => isset($data['scrape_date']) ? $data['scrape_date'] : '',
+            'shipment_province_id' => isset($data['shipment_province_id']) ? $data['shipment_province_id'] : '0', // 发货省份id
+            'shipment_province_name' => isset($data['shipment_province_name']) ? $data['shipment_province_name'] : '', // 发货省份
+            'shipment_city_id' => isset($data['shipment_city_id']) ? $data['shipment_city_id'] : '0', // 发货城市id
+            'shipment_city_name' => isset($data['shipment_city_name']) ? $data['shipment_city_name'] : '', // 发货城市
         ];
         $ViolationProduct_id = $this->insertGetId($insert_data);
         return $ViolationProduct_id;
@@ -99,6 +112,7 @@ class ViolationProduct extends Model
             $source_where[] = ['source_id', '=', $data['source_id']];
             $source_where[] = ['product_name', '=', $data['product_name']];
             $source_where[] = ['product_specs', '=', $data['product_specs']];
+            $source_where[] = ['product_brand', '=', $data['product_brand']];
             $source_id_log = $this->where($source_where)->count();
             if ($source_id_log > 0) {
                 return true;
@@ -114,6 +128,7 @@ class ViolationProduct extends Model
                 'responsible_person' => $data['responsible_person'] ? ',' . $data['responsible_person'] . ',' : '',
                 'platform'    => $data['platform'],
                 'company_name'    => $data['company_name'],
+                'product_brand'   => $data['product_brand'],
                 'product_name'    => $data['product_name'],
                 'product_specs'    => $data['product_specs'],
                 'online_posting_count'    => isset($data['online_posting_count']) && is_numeric($data['online_posting_count']) ? $data['online_posting_count'] : 1,
@@ -132,10 +147,10 @@ class ViolationProduct extends Model
                 'processing_status' => '1',
                 'insert_time' => time(),
                 'scrape_date' => isset($data['scrape_date']) ? $data['scrape_date'] : '',
-                'shipment_province_id'=> isset($data['shipment_province_id']) ? $data['shipment_province_id'] : '0', // 发货省份id
-                'shipment_province_name'=> isset($data['shipment_province_name']) ? $data['shipment_province_name'] : '', // 发货省份
-                'shipment_city_id'=> isset($data['shipment_city_id']) ? $data['shipment_city_id'] : '0', // 发货城市id
-                'shipment_city_name'=> isset($data['shipment_city_name']) ? $data['shipment_city_name'] : '', // 发货城市
+                'shipment_province_id' => isset($data['shipment_province_id']) ? $data['shipment_province_id'] : '0', // 发货省份id
+                'shipment_province_name' => isset($data['shipment_province_name']) ? $data['shipment_province_name'] : '', // 发货省份
+                'shipment_city_id' => isset($data['shipment_city_id']) ? $data['shipment_city_id'] : '0', // 发货城市id
+                'shipment_city_name' => isset($data['shipment_city_name']) ? $data['shipment_city_name'] : '', // 发货城市
             ];
             $ViolationProduct_id = $this->insertGetId($insert_data);
             $first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];