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

@@ -67,7 +67,7 @@ class ProjectUpdate extends Command
         $api_url_arr = explode('?', $task->api_url);
         $api_url_arr = explode('?', $task->api_url);
         $api_url = $api_url_arr[0];
         $api_url = $api_url_arr[0];
 
 
-        $page_size = 10;
+        $page_size = 20;
 
 
         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', task_type: ' . $api_type . ', update start' . PHP_EOL;
         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', task_type: ' . $api_type . ', update start' . PHP_EOL;
 
 

@@ -207,7 +207,7 @@ class LoginController extends BaseController
      * @time   :2023/9/1 10:12
      * @time   :2023/9/1 10:12
      */
      */
     public function getWechatLoginInfo(){
     public function getWechatLoginInfo(){
-        $this->request->validate([
+        $this->param = $this->request->validate([
             'ticket' => 'required',
             'ticket' => 'required',
         ],[
         ],[
             'ticket.required' => 'ticket不能为空',
             'ticket.required' => 'ticket不能为空',

@@ -336,12 +336,9 @@ class ProductLogic extends  BaseLogic
     public function batchSetCategory(){
     public function batchSetCategory(){
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
-            //删除分类关联表记录
-            $categoryRelatedModel = new CategoryRelated();
-            $categoryRelatedModel->del(['product_id'=>['in',$this->param['id']]]);
             //批量
             //批量
             $param = [
             $param = [
-                'category_id'=>Arr::arrToSet($this->param['category_id']),
+                'category_id'=>','.Arr::arrToSet($this->param['category_id']).',',
                 'status'=>$this->param['status']
                 'status'=>$this->param['status']
             ];
             ];
             $this->model->edit($param,['id'=>['in',$this->param['id']]]);
             $this->model->edit($param,['id'=>['in',$this->param['id']]]);
@@ -349,7 +346,7 @@ class ProductLogic extends  BaseLogic
             //对应添加关联表
             //对应添加关联表
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();
-            $this->fail('error');
+            $this->fail('系统错误，请联系管理员');
         }
         }
         return $this->success();
         return $this->success();
     }
     }