[智价云] 导入省份校验更新

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

@@ -72,7 +72,7 @@ class LowPriceGoods extends Controller
         if ($is_admin != 1 && $company_id != 0) {
             $low_price_goods_where['company_id'] = $company_id;
         } else {
-           $low_price_goods_where['company_id']  = $admin_company_id;
+            $low_price_goods_where['company_id']  = $admin_company_id;
         }
         $LowPriceGoodsModel = $LowPriceGoodsModel->where($low_price_goods_where);
         //多选平台查询
@@ -210,7 +210,7 @@ class LowPriceGoods extends Controller
         if ($is_admin != 1 && $company_id != 0) {
             $low_price_goods_where['company_id'] = $company_id;
         } else {
-           $low_price_goods_where['company_id']  = $admin_company_id;
+            $low_price_goods_where['company_id']  = $admin_company_id;
         }
         $LowPriceGoodsModel = $LowPriceGoodsModel->where($low_price_goods_where);
         //多选平台查询
@@ -469,7 +469,7 @@ class LowPriceGoods extends Controller
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
         } else {
-           $map['company_id']  = $admin_company_id;
+            $map['company_id']  = $admin_company_id;
         }
         $data = $LowPriceGoodsModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -629,7 +629,7 @@ class LowPriceGoods extends Controller
         } else {
             $where['company_id']  = $admin_company_id;
         }
-         $LowPriceGoods = $LowPriceGoodsModel->where($where)->first();
+        $LowPriceGoods = $LowPriceGoodsModel->where($where)->first();
         if (!$LowPriceGoods) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $LowPriceGoods->processing_status = $processing_status;
         $LowPriceGoods->update_time = time();
@@ -696,7 +696,7 @@ class LowPriceGoods extends Controller
         } else {
             $company_id  = $admin_company_id;
         }
-        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id,'is_admin' => $is_admin,'company_id' => $company_id];
+        $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id, 'is_admin' => $is_admin, 'company_id' => $company_id];
         LowPriceGoodsJobs::dispatch($message_data);
         // LowPriceGoodsJobs::dispatchSync($message_data);
         // 告知结果
@@ -1035,12 +1035,15 @@ class LowPriceGoods extends Controller
                             $province_name = '宁夏回族自治区';
                             break;
                     }
+                } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
+                    break;
                 } else if (strpos($province_name, '省') === false) {
                     //是否存在市省，如果不存在则补全
                     if (strpos($province_name, '省') === false) {
                         $province_name = $province_name . '省';
                     }
                 }
+
                 if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
                 $city_name = $item[16];
                 if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => '']);
@@ -1099,37 +1102,37 @@ class LowPriceGoods extends Controller
     {
         $key = $key + 1;
         if (!$item[2]) {
-            return ['code' => 'error', 'msg' => "第{$key}行平台不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行平台不能为空", 'data' => $item];
         }
         if (!$item[4]) {
-            return ['code' => 'error', 'msg' => "第{$key}行商品名称不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行商品名称不能为空", 'data' => $item];
         }
         if (!$item[5]) {
-            return ['code' => 'error', 'msg' => "第{$key}行商品规格不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行商品规格不能为空", 'data' => $item];
         }
         if (!$item[6]) {
-            return ['code' => 'error', 'msg' => "第{$key}行监控价格不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行监控价格不能为空", 'data' => $item];
         }
         if (!$item[7]) {
-            return ['code' => 'error', 'msg' => "第{$key}行挂网价格不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行挂网价格不能为空", 'data' => $item];
         }
         if (!$item[10]) {
-            return ['code' => 'error', 'msg' => "第{$key}行链接地址不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行链接地址不能为空", 'data' => $item];
         }
         if (!$item[11]) {
-            return ['code' => 'error', 'msg' => "第{$key}行店铺名称不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行店铺名称不能为空", 'data' => $item];
         }
         if (!$item[12]) {
-            return ['code' => 'error', 'msg' => "第{$key}行公司名称不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行公司名称不能为空", 'data' => $item];
         }
         if (!$item[14]) {
-            return ['code' => 'error', 'msg' => "第{$key}行信用代码不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行信用代码不能为空", 'data' => $item];
         }
         if (!$item[15]) {
-            return ['code' => 'error', 'msg' => "第{$key}行省份不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行省份不能为空", 'data' => $item];
         }
         if (!$item[16]) {
-            return ['code' => 'error', 'msg' => "第{$key}行城市不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行城市不能为空", 'data' => $item];
         }
     }
 }

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

@@ -840,6 +840,8 @@ class ViolationProduct extends Controller
                             $province_name = '宁夏回族自治区';
                             break;
                     }
+                } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
+                    break;
                 } else if (strpos($province_name, '省') === false) {
                     //是否存在市省，如果不存在则补全
                     if (strpos($province_name, '省') === false) {
@@ -902,31 +904,31 @@ class ViolationProduct extends Controller
     {
         $key = $key + 1;
         if (!$item[2]) {
-            return ['code' => 'error', 'msg' => "第{$key}行平台不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行平台不能为空", 'data' => $item];
         }
         if (!$item[4]) {
-            return ['code' => 'error', 'msg' => "第{$key}行商品名称不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行商品名称不能为空", 'data' => $item];
         }
         if (!$item[5]) {
-            return ['code' => 'error', 'msg' => "第{$key}行商品规格不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行商品规格不能为空", 'data' => $item];
         }
         if (!$item[8]) {
-            return ['code' => 'error', 'msg' => "第{$key}行链接地址不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行链接地址不能为空", 'data' => $item];
         }
         if (!$item[9]) {
-            return ['code' => 'error', 'msg' => "第{$key}行店铺名称不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行店铺名称不能为空", 'data' => $item];
         }
         if (!$item[10]) {
-            return ['code' => 'error', 'msg' => "第{$key}行公司名称不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行公司名称不能为空", 'data' => $item];
         }
         if (!$item[12]) {
-            return ['code' => 'error', 'msg' => "第{$key}行信用代码不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行信用代码不能为空", 'data' => $item];
         }
         if (!$item[13]) {
-            return ['code' => 'error', 'msg' => "第{$key}行省份不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行省份不能为空", 'data' => $item];
         }
         if (!$item[14]) {
-            return ['code' => 'error', 'msg' => "第{$key}行城市不能为空",'data'=>$item];
+            return ['code' => 'error', 'msg' => "第{$key}行城市不能为空", 'data' => $item];
         }
     }
 }