Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -54,7 +54,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[221]],'is_upgrade'=>0]);
+        $list = $projectModel->list(['id'=>['in',[68]],'is_upgrade'=>0]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);

@@ -130,4 +130,23 @@ class CustomModuleCategoryController extends BaseController
         $logic->categoryDel();
         $logic->categoryDel();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/3 14:18
+     */
+    public function sort(CustomModuleCategoryLogic $logic){
+        $this->request->validate([
+            'id'=>['required'],
+            'sort'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+            'sort.required' => '排序字段不能为空',
+        ]);
+        $logic->categorySort();
+        $this->response('success');
+    }
 }
 }

@@ -219,4 +219,19 @@ class CustomModuleCategoryLogic extends BaseLogic
         $this->curlDelRoute(['route'=>$info['route']]);
         $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :排序
+     * @name   :categorySort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:38
+     */
+    public function categorySort(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('系统错误，请联系管理员');
+        }
+        return $this->success();
+    }
 }
 }

@@ -202,7 +202,7 @@ class CategoryLogic extends  BaseLogic
      * 产品导入：分类处理
      * 产品导入：分类处理
      * @param $project_id
      * @param $project_id
      * @param $category
      * @param $category
-     * @return string
+     * @return array
      * @throws \Exception
      * @throws \Exception
      * @author Akun
      * @author Akun
      * @date 2023/09/21 14:55
      * @date 2023/09/21 14:55
@@ -227,7 +227,9 @@ class CategoryLogic extends  BaseLogic
         }
         }
         //清除缓存
         //清除缓存
         Common::del_user_cache('product_category',$project_id);
         Common::del_user_cache('product_category',$project_id);
-        return $this->getLastCategory($return);
+        $category_id =  $this->getLastCategory($return);
+
+        return ['category_id'=>$category_id,'category_arr'=>$return];
     }
     }
 
 
     /**
     /**

@@ -616,10 +616,13 @@ class ProductLogic extends  BaseLogic
         if (!$product) {
         if (!$product) {
 
 
             $category_id = '';
             $category_id = '';
+            $category_arr = [];
             if ($data[2]??'') {
             if ($data[2]??'') {
                 //处理分类
                 //处理分类
                 $categoryLogic = new CategoryLogic();
                 $categoryLogic = new CategoryLogic();
-                $category_id = $categoryLogic->importProductCategory($project_id, $data[2]);
+                $category_info = $categoryLogic->importProductCategory($project_id, $data[2]);
+                $category_id = $category_info['category_id'];
+                $category_arr = $category_info['category_arr'];
             }
             }
 
 
             $keyword_id = '';
             $keyword_id = '';
@@ -805,6 +808,11 @@ class ProductLogic extends  BaseLogic
 
 
             $this->edit(['route' => $route], ['id' => $id]);
             $this->edit(['route' => $route], ['id' => $id]);
 
 
+            //关联分类
+            if($category_arr){
+                CategoryRelated::saveRelated($id, $category_arr);
+            }
+
             return true;
             return true;
         }
         }
 
 

@@ -65,8 +65,8 @@ class RankDataLogic extends BaseLogic
             'cert_info' => $domain_info['cert_info'] ?? '',
             'cert_info' => $domain_info['cert_info'] ?? '',
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'keyword_num' => $project['deploy_build']['keyword_num'],
-            'compliance_day' => $rank['compliance_day'] ?? 0,
-            'remain_day' => $project['deploy_build']['service_duration'] - ($rank['compliance_day'] ?? 0),
+            'compliance_day' => $project['compliance_day'] ?? 0,
+            'remain_day' => $project['deploy_build']['service_duration'] - ($project['compliance_day'] ?? 0),
         ];
         ];
 
 
         //小语种列表
         //小语种列表

@@ -446,6 +446,7 @@ Route::middleware(['bloginauth'])->group(function () {
             Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'info'])->name('custom_category_info');
             Route::any('/info', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'info'])->name('custom_category_info');
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'save'])->name('custom_category_save');
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'save'])->name('custom_category_save');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'del'])->name('custom_category_del');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'del'])->name('custom_category_del');
+            Route::any('/sort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'sort'])->name('custom_category_sort');
         });
         });
 
 
         Route::prefix('content')->group(function () {
         Route::prefix('content')->group(function () {