合并分支 'lyh-server' 到 'master'

gx数据



查看合并请求 !1436

@@ -55,7 +55,7 @@ class LyhImportTest extends Command
         ProjectServer::useProject(3283);
         ProjectServer::useProject(3283);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
 //        $this->importProductCategory('https://ecdn6.globalso.com/upload/p/3283/file/2025-03/zy_boss_pricelistcat_202503131025.csv','3283');
 //        $this->importProductCategory('https://ecdn6.globalso.com/upload/p/3283/file/2025-03/zy_boss_pricelistcat_202503131025.csv','3283');
-        $this->importProduct('https://ecdn6.globalso.com/upload/p/3283/file/2025-03/zy_boss_price_copy1_202503121340.csv',3283);
+        $this->importProduct('https://ecdn6.globalso.com/upload/p/3283/file/2025-03/zy_boss_price_copy1.csv',3283);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
@@ -146,8 +146,8 @@ class LyhImportTest extends Command
                 continue;
                 continue;
             }
             }
             $saveData = [];
             $saveData = [];
-            if(!empty($val[0])){
-                $saveData['title'] = $val[0];
+            if(!empty($val[11])){
+                $saveData['title'] = $val[11];
             }else{
             }else{
                 continue;
                 continue;
             }
             }
@@ -160,10 +160,10 @@ class LyhImportTest extends Command
             $saveData['project_id'] = $project_id;
             $saveData['project_id'] = $project_id;
             $saveData['status'] = 1;
             $saveData['status'] = 1;
             $saveData['intro'] = $val[6] ?? '';
             $saveData['intro'] = $val[6] ?? '';
-            $seo = ['title'=>$val[0]];
+            $seo = ['title'=>$val[11]];
             $saveData['seo_mate'] = json_encode($seo,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['seo_mate'] = json_encode($seo,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-            $thumb = ['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[11])];
-            $gallery = [['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[11])]];
+            $thumb = ['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[12])];
+            $gallery = [['alt'=>'主图','url'=>str_replace('/public','/upload/p/3283',$val[12])]];
             $saveData['thumb'] = json_encode($thumb,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['thumb'] = json_encode($thumb,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['gallery'] = json_encode($gallery,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             $saveData['gallery'] = json_encode($gallery,JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
             try {
             try {
@@ -177,7 +177,7 @@ class LyhImportTest extends Command
                 CategoryRelated::saveRelated($id,[$cateInfo['id']]);
                 CategoryRelated::saveRelated($id,[$cateInfo['id']]);
             }
             }
             //设置路由
             //设置路由
-            $route = RouteMap::setRoute($val[0],RouteMap::SOURCE_PRODUCT,$id,$project_id);
+            $route = RouteMap::setRoute($val[11],RouteMap::SOURCE_PRODUCT,$id,$project_id);
             $productModel->edit(['route'=>$route],['id'=>$id]);
             $productModel->edit(['route'=>$route],['id'=>$id]);
             echo date('Y-m-d H:i:s') . '新增产品id:'.$id . PHP_EOL;
             echo date('Y-m-d H:i:s') . '新增产品id:'.$id . PHP_EOL;
             if(!empty($val[2])){
             if(!empty($val[2])){