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

增加删除产品删除描述功能



查看合并请求 !1041

@@ -426,6 +426,8 @@ class ProductLogic extends  BaseLogic
     public function productDelete(){
     public function productDelete(){
         DB::connection('custom_mysql')->beginTransaction();
         DB::connection('custom_mysql')->beginTransaction();
         try {
         try {
+            $columnModel = new Column();
+            $detailModel = new Detail();
             $cateRelate = new CategoryRelated();
             $cateRelate = new CategoryRelated();
             //删除扩展字段
             //删除扩展字段
             $extendInfoModel = new ExtendInfo();
             $extendInfoModel = new ExtendInfo();
@@ -441,6 +443,9 @@ class ProductLogic extends  BaseLogic
                     //删除关联表
                     //删除关联表
                     $cateRelate->del(['product_id'=>$id]);
                     $cateRelate->del(['product_id'=>$id]);
                     $extendInfoModel->del(['product_id'=>$id]);
                     $extendInfoModel->del(['product_id'=>$id]);
+                    //删除描述
+                    $columnModel->del(['product_id'=>$id]);
+                    $detailModel->del(['product_id'=>$id]);
                 }else{
                 }else{
                     $this->delRoute($id);
                     $this->delRoute($id);
                     //回收站
                     //回收站