gx

@@ -135,7 +135,10 @@ class KeywordController extends BaseController
             'title.array' => 'title为数组',
             'title.array' => 'title为数组',
             'title.max' => '批量操作不能超过1000条数据'
             'title.max' => '批量操作不能超过1000条数据'
         ]);
         ]);
-        $logic->batchAdd();
+        $rs = $logic->batchAdd();
+        if($rs === false){
+            $this->response('创建任务添加关键词任务失败，请稍后重试！',Code::SYSTEM_ERROR);
+        }
         $this->response('关键词后台异步添加中，请稍后刷新查看！');
         $this->response('关键词后台异步添加中，请稍后刷新查看！');
     }
     }
 
 

@@ -20,6 +20,7 @@ use App\Models\Product\Product;
 use App\Models\Template\Setting;
 use App\Models\Template\Setting;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
 use App\Models\User\User;
 use App\Models\User\User;
+use App\Models\WebSetting\SettingNum;
 use App\Rules\Ids;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
@@ -468,4 +469,51 @@ class ProductController extends BaseController
         $logic->setAllSort();
         $logic->setAllSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :设置产品排序
+     * @name   :setProductSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/31 10:14
+     */
+    public function setProductSort(){
+        $setNumModel = new SettingNum();
+        try {
+            if(isset($this->param['id']) && !empty($this->param['id'])){
+                //执行编辑
+                $param = [
+                    'data'=>json_encode($this->param['data']),
+                ];
+                $setNumModel->edit($param,['id'=>$this->param['id']]);
+            }else{
+                //执行新增
+                $param = [
+                    'type'=>$setNumModel::TYPE_PRODUCT_SORT,
+                    'project_id'=>$this->user['project_id'],
+                    'data'=>json_encode($this->param['data']),
+                ];
+                $setNumModel->add($param);
+            }
+        }catch (\Exception $e){
+            $this->fail('系统错误，请联系管理员');
+        }
+        $this->response('success');
+    }
+
+    /**
+     * @remark :获取产品排序
+     * @name   :getProductSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/31 10:24
+     */
+    public function getProductSort(){
+        $setNumModel = new SettingNum();
+        $info = $setNumModel->read(['type'=>$setNumModel::TYPE_PRODUCT_SORT]);
+        if($info === false){
+            $info = [];
+        }
+        $this->response('success',Code::SUCCESS,$info);
+    }
 }
 }

@@ -55,7 +55,7 @@ class OnlineCheckLogic extends BaseLogic
                 $param['type'] = $this->param['project_type'];
                 $param['type'] = $this->param['project_type'];
             }
             }
             if(isset($param)){
             if(isset($param)){
-                $projectModel->edit(['type'=>$this->param['project_type']],['id'=>$this->param['id']]);
+                $projectModel->edit($param,['id'=>$this->param['id']]);
             }
             }
         }
         }
         $data = [
         $data = [

@@ -145,10 +145,10 @@ class KeywordLogic extends  BaseLogic
                     $this->model->insertGetId($param);
                     $this->model->insertGetId($param);
                 }
                 }
             }
             }
-            NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);
         }catch (\Exception $e){
         }catch (\Exception $e){
-            $this->fail('创建任务添加关键词任务失败，请稍后重试！');
+            return false;
         }
         }
+        NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -20,6 +20,8 @@ use App\Models\Base;
  */
  */
 class SettingNum extends Base
 class SettingNum extends Base
 {
 {
+    const TYPE_PRODUCT_SORT = 10;//c端显示排序
+
     protected $table = 'gl_setting_num';
     protected $table = 'gl_setting_num';
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';

@@ -223,6 +223,8 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('/editList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'editList'])->name('product_editList');
         Route::post('/editList', [\App\Http\Controllers\Bside\Product\ProductController::class, 'editList'])->name('product_editList');
         Route::post('/sort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'sort'])->name('product_sort');
         Route::post('/sort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'sort'])->name('product_sort');
         Route::post('/allSort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'allSort'])->name('product_allSort');
         Route::post('/allSort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'allSort'])->name('product_allSort');
+        Route::post('/setProductSort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'setProductSort'])->name('product_setProductSort');
+        Route::post('/getProductSort', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getProductSort'])->name('product_getProductSort');
         Route::any('/delete', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delete'])->name('product_delete');
         Route::any('/delete', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delete'])->name('product_delete');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getStatusNumber'])->name('product_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getStatusNumber'])->name('product_statusNum');
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');
         Route::any('/copyProduct', [\App\Http\Controllers\Bside\Product\ProductController::class, 'copyProduct'])->name('product_copyProduct');