[智价云] 省市信息合并

app/Jobs/Manager/Process/LowPriceGoodsDataJobs.php

@@ -103,7 +103,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
             $ScrapeDataModel = $ScrapeDataModel->whereIn('platform_id', $platform);
         }
         $ScrapeDataModel = $ScrapeDataModel->where([['min_price', '>=', '0.01'], ['number', '>=', '1']]);
-        $start_time =$message_data['start_time'];
+        $start_time = $message_data['start_time'];
         $end_time = $message_data['end_time'];
         $start_time_string = date('Y-m-d H:i:s', $start_time);
         $end_time_string = date('Y-m-d H:i:s', $end_time);
@@ -329,10 +329,26 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 $product_data['link_url'] = $matches[0];
             }
             if (trim($product_data['link_url']) == '') continue;
-            $is_ultra_low_price = 0;//是否超低价0=否1=是
-            if($ultra_low_price > 0 && $product_data['online_posting_count'] < $ultra_low_price){
+            $is_ultra_low_price = 0; //是否超低价0=否1=是
+            if ($ultra_low_price > 0 && $product_data['online_posting_count'] < $ultra_low_price) {
                 $is_ultra_low_price = 1;
             }
+            //合并省份市区ID
+            $merge_city_id = 0;
+            $merge_province_id = 0;
+            $merge_city_name = '';
+            $merge_province_name = '';
+            if (!empty($product_data['city_id']) && !empty($product_data['province_id'])) {
+                $merge_city_id = $product_data['city_id'];
+                $merge_province_id = $product_data['province_id'];
+                $merge_city_name = $city_name;
+                $merge_province_name = $province_name;
+            } else if (!empty($product_data['shipment_city_id']) && !empty($product_data['shipment_province_id'])) {
+                $merge_city_id = $product_data['shipment_city_id'];
+                $merge_province_id = $product_data['shipment_province_id'];
+                $merge_city_name = $shipment_city_name;
+                $merge_province_name = $shipment_province_name;
+            }
             $insert_product_data = [
                 'company_id' => $company_id,
                 'source_id' => $product_data['id'],
@@ -371,6 +387,10 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 'shipment_city_id' => $product_data['shipment_city_id'],
                 'shipment_city_name' => $product_data['shipment_city_name'],
                 'collect_config_info' => $product_data['collect_config_info'],
+                'merge_city_id' => $merge_city_id,
+                'merge_province_id' => $merge_province_id,
+                'merge_city_name' => $merge_city_name,
+                'merge_province_name' => $merge_province_name,
             ];
 
             //获取指定人员信息

app/Jobs/Manager/Process/ViolationProductDataJobs.php

@@ -324,6 +324,22 @@ class ViolationProductDataJobs implements ShouldQueue
                 $product_data['link_url'] = $matches[0];
             }
             if (trim($product_data['link_url']) == '') continue;
+            //合并省份市区ID
+            $merge_city_id = 0;
+            $merge_province_id = 0;
+            $merge_city_name = '';
+            $merge_province_name = '';
+            if (!empty($product_data['city_id']) && !empty($product_data['province_id'])) {
+                $merge_city_id = $product_data['city_id'];
+                $merge_province_id = $product_data['province_id'];
+                $merge_city_name = $city_name;
+                $merge_province_name = $province_name;
+            } else if (!empty($product_data['shipment_city_id']) && !empty($product_data['shipment_province_id'])) {
+                $merge_city_id = $product_data['shipment_city_id'];
+                $merge_province_id = $product_data['shipment_province_id'];
+                $merge_city_name = $shipment_city_name;
+                $merge_province_name = $shipment_province_name;
+            }
             $insert_product_data = [
                 'company_id' => $company_id,
                 'source_id' => $product_data['id'],
@@ -358,6 +374,10 @@ class ViolationProductDataJobs implements ShouldQueue
                 'shipment_city_id' => $product_data['shipment_city_id'],
                 'shipment_city_name' => $product_data['shipment_city_name'],
                 'collect_config_info' => $product_data['collect_config_info'],
+                'merge_city_id' => $merge_city_id,
+                'merge_province_id' => $merge_province_id,
+                'merge_city_name' => $merge_city_name,
+                'merge_province_name' => $merge_province_name,
             ];
             //获取指定人员信息
             if ($specify_responsible_person == 0) {

app/Models/Manager/Process/LowPriceGoods.php

@@ -99,6 +99,10 @@ class LowPriceGoods extends Model
             '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'] : '', // 发货城市
+            'merge_city_id' => $data['merge_city_id'],
+            'merge_province_id' => $data['merge_province_id'],
+            'merge_city_name' => $data['merge_city_name'],
+            'merge_province_name' => $data['merge_province_name'],
         ];
         $LowPriceGoods_id = $this->insertGetId($insert_data);
         return $LowPriceGoods_id;
@@ -137,7 +141,7 @@ class LowPriceGoods extends Model
         try {
             //执行挂网数据统计
             $data = $this->handleCountData($data);
-            
+
             $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
             $insert_data = [
                 'company_id' => $data['company_id'],
@@ -175,6 +179,10 @@ class LowPriceGoods extends Model
                 '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'] : '', // 发货城市
+                'merge_city_id' => $data['merge_city_id'],
+                'merge_province_id' => $data['merge_province_id'],
+                'merge_city_name' => $data['merge_city_name'],
+                'merge_province_name' => $data['merge_province_name'],
             ];
 
             $LowPriceGoods_id = $this->insertGetId($insert_data);
@@ -247,7 +255,7 @@ class LowPriceGoods extends Model
         if (trim($collect_config_info) == '') return $product_data_info;
         $collect_config_info = json_decode($collect_config_info, true); //{"sampling_cycle": "", "sampling_start_time": "", "sampling_end_time": ""}
         //采集周期
-        $sampling_cycle = isset($collect_config_info['sampling_cycle']) ? explode(',',$collect_config_info['sampling_cycle']) : '';
+        $sampling_cycle = isset($collect_config_info['sampling_cycle']) ? explode(',', $collect_config_info['sampling_cycle']) : '';
         //采集开始时间
         $sampling_start_time = isset($collect_config_info['sampling_start_time']) ? $collect_config_info['sampling_start_time'] : '';
         //采集结束时间
@@ -262,11 +270,11 @@ class LowPriceGoods extends Model
             if ($now_week == 0) {
                 $now_week = 7;
             }
-            if(!in_array($now_week, $sampling_cycle)){
+            if (!in_array($now_week, $sampling_cycle)) {
                 return $product_data_info;
             }
             //查询当前商品是否在上一个周期采集中过
-            $up_scrape_date_time = $collection_time - 7 * 24 * 3600;//查询上周这个时间点
+            $up_scrape_date_time = $collection_time - 7 * 24 * 3600; //查询上周这个时间点
             $up_scrape_date = date('Y-m-d', $up_scrape_date_time);
             $source_last_week_where[] = ['company_id', '=', $product_data_info['company_id']]; //品牌方公司ID
             $source_last_week_where[] = ['platform', '=', $product_data_info['platform']]; //挂网平台ID
@@ -300,11 +308,11 @@ class LowPriceGoods extends Model
             if ($now_week == 0) {
                 $now_week = 7;
             }
-            if(!in_array($now_week, $sampling_cycle)){
+            if (!in_array($now_week, $sampling_cycle)) {
                 return $product_data_info;
             }
             //查询当前商品是否在上一个周期采集中过
-            $up_scrape_date_time = $collection_time - 7 * 24 * 3600;//查询上周这个时间点
+            $up_scrape_date_time = $collection_time - 7 * 24 * 3600; //查询上周这个时间点
             //查询当前商品上次采集记录
             $up_scrape_date = date('Y-m-d', $up_scrape_date_time);
             $source_last_week_where[] = ['company_id', '=', $product_data_info['company_id']]; //品牌方公司ID

app/Models/Manager/Process/ViolationProduct.php

@@ -93,6 +93,10 @@ class ViolationProduct extends Model
             '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'] : '', // 发货城市
+            'merge_city_id' => $data['merge_city_id'],
+            'merge_province_id' => $data['merge_province_id'],
+            'merge_city_name' => $data['merge_city_name'],
+            'merge_province_name' => $data['merge_province_name'],
         ];
         $ViolationProduct_id = $this->insertGetId($insert_data);
         return $ViolationProduct_id;
@@ -161,6 +165,10 @@ class ViolationProduct extends Model
                 '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'] : '', // 发货城市
+                'merge_city_id' => $data['merge_city_id'],
+                'merge_province_id' => $data['merge_province_id'],
+                'merge_city_name' => $data['merge_city_name'],
+                'merge_province_name' => $data['merge_province_name'],
             ];
             $ViolationProduct_id = $this->insertGetId($insert_data);
             $first_responsible_persons = $data['first_responsible_person'] != '' ? explode(',', $data['first_responsible_person']) : [];
@@ -233,7 +241,7 @@ class ViolationProduct extends Model
         if (trim($collect_config_info) == '') return $product_data_info;
         $collect_config_info = json_decode($collect_config_info, true); //{"sampling_cycle": "", "sampling_start_time": "", "sampling_end_time": ""}
         //采集周期
-        $sampling_cycle = isset($collect_config_info['sampling_cycle']) ? explode(',',$collect_config_info['sampling_cycle']) : '';
+        $sampling_cycle = isset($collect_config_info['sampling_cycle']) ? explode(',', $collect_config_info['sampling_cycle']) : '';
         //采集开始时间
         $sampling_start_time = isset($collect_config_info['sampling_start_time']) ? $collect_config_info['sampling_start_time'] : '';
         //采集结束时间
@@ -248,11 +256,11 @@ class ViolationProduct extends Model
             if ($now_week == 0) {
                 $now_week = 7;
             }
-            if(!in_array($now_week, $sampling_cycle)){
+            if (!in_array($now_week, $sampling_cycle)) {
                 return $product_data_info;
             }
             //查询当前商品是否在上一个周期采集中过
-            $up_scrape_date_time = $collection_time - 7 * 24 * 3600;//查询上周这个时间点
+            $up_scrape_date_time = $collection_time - 7 * 24 * 3600; //查询上周这个时间点
             $up_scrape_date = date('Y-m-d', $up_scrape_date_time);
             $source_last_week_where[] = ['company_id', '=', $product_data_info['company_id']]; //品牌方公司ID
             $source_last_week_where[] = ['platform', '=', $product_data_info['platform']]; //挂网平台ID
@@ -286,11 +294,11 @@ class ViolationProduct extends Model
             if ($now_week == 0) {
                 $now_week = 7;
             }
-            if(!in_array($now_week, $sampling_cycle)){
+            if (!in_array($now_week, $sampling_cycle)) {
                 return $product_data_info;
             }
             //查询当前商品是否在上一个周期采集中过
-            $up_scrape_date_time = $collection_time - 7 * 24 * 3600;//查询上周这个时间点
+            $up_scrape_date_time = $collection_time - 7 * 24 * 3600; //查询上周这个时间点
             //查询当前商品上次采集记录
             $up_scrape_date = date('Y-m-d', $up_scrape_date_time);
             $source_last_week_where[] = ['company_id', '=', $product_data_info['company_id']]; //品牌方公司ID