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

@@ -50,7 +50,7 @@ class UpdateProductCategory extends Command
     public function handle(){
     public function handle(){
         //获取所有项目
         //获取所有项目
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1077]]],'id',['id']);
+        $list = $projectModel->list(['id'=>['in',[1515]]],'id',['id']);
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         try {
         try {
             foreach ($list as $v) {
             foreach ($list as $v) {

@@ -688,7 +688,7 @@ class ProjectUpdate extends Command
                                                         'name' => $item['title'],
                                                         'name' => $item['title'],
                                                         'category_id' => $category_id,
                                                         'category_id' => $category_id,
                                                         'content' => $item['content'] ?? '',
                                                         'content' => $item['content'] ?? '',
-                                                        'sort' => $item['sort'] ?? 0,
+                                                        'sort' => $sort,
                                                         'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                         'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                         'image' => $new_img
                                                         'image' => $new_img
                                                     ], ['id' => $id]);
                                                     ], ['id' => $id]);

@@ -362,6 +362,7 @@ class ProductLogic extends  BaseLogic
     public function productDelete(){
     public function productDelete(){
         DB::connection('custom_mysql')->beginTransaction();
         DB::connection('custom_mysql')->beginTransaction();
         try {
         try {
+            $cateRelate = new CategoryRelated();
             foreach ($this->param['ids'] as $id) {
             foreach ($this->param['ids'] as $id) {
                 $info = $this->model->read(['id'=>$id],['id','status']);
                 $info = $this->model->read(['id'=>$id],['id','status']);
                 if($info['status'] == Product::STATUS_RECYCLE){
                 if($info['status'] == Product::STATUS_RECYCLE){
@@ -369,6 +370,8 @@ class ProductLogic extends  BaseLogic
                     //删除当前产品模版
                     //删除当前产品模版
                     $this->delProductModule($id);
                     $this->delProductModule($id);
                     $this->model->del(['id'=>$id]);
                     $this->model->del(['id'=>$id]);
+                    //删除关联表
+                    $cateRelate->del(['product_id'=>$id]);
                 }else{
                 }else{
                     //回收站
                     //回收站
                     $this->model->edit(['status'=>Product::STATUS_RECYCLE],['id'=>$id]);
                     $this->model->edit(['status'=>Product::STATUS_RECYCLE],['id'=>$id]);