周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 077f513f44708dd41cc69af189ad5e3fa9ed0430 1 个父辈 9e823182

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 13 行增加 和 10 行删除
@@ -131,13 +131,14 @@ class BlogLogic extends BaseLogic @@ -131,13 +131,14 @@ class BlogLogic extends BaseLogic
131 foreach ($this->param['id'] as $id){ 131 foreach ($this->param['id'] as $id){
132 $info = $this->model->read(['id'=>$id],['id','status']); 132 $info = $this->model->read(['id'=>$id],['id','status']);
133 if($info['status'] != 2){ 133 if($info['status'] != 2){
  134 + $this->delRoute($id);
134 $this->model->edit(['status'=>2],['id'=>$id]); 135 $this->model->edit(['status'=>2],['id'=>$id]);
135 }else{ 136 }else{
136 //删除路由映射 137 //删除路由映射
  138 + $this->delRoute($id);
137 RouteMap::delRoute(RouteMap::SOURCE_BLOG, $id, $this->user['project_id']); 139 RouteMap::delRoute(RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
138 $this->model->del(['id' => $id]); 140 $this->model->del(['id' => $id]);
139 } 141 }
140 - $this->delRoute($id);  
141 } 142 }
142 DB::commit(); 143 DB::commit();
143 }catch (Exception $e){ 144 }catch (Exception $e){
@@ -161,13 +161,14 @@ class NewsLogic extends BaseLogic @@ -161,13 +161,14 @@ class NewsLogic extends BaseLogic
161 foreach ($this->param['id'] as $id) { 161 foreach ($this->param['id'] as $id) {
162 $info = $this->model->read(['id'=>$id],['id','status']); 162 $info = $this->model->read(['id'=>$id],['id','status']);
163 if($info['status'] != 2){ 163 if($info['status'] != 2){
  164 + $this->delRoute($id);
164 $this->model->edit(['status'=>2],['id'=>$id]); 165 $this->model->edit(['status'=>2],['id'=>$id]);
165 }else{ 166 }else{
166 //删除路由映射 167 //删除路由映射
167 RouteMap::delRoute(RouteMap::SOURCE_NEWS, $id, $this->user['project_id']); 168 RouteMap::delRoute(RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
  169 + $this->delRoute($id);
168 $this->model->del(['id' => $id]); 170 $this->model->del(['id' => $id]);
169 } 171 }
170 - $this->delRoute($id);  
171 } 172 }
172 DB::commit(); 173 DB::commit();
173 } catch (Exception $e) { 174 } catch (Exception $e) {
@@ -424,8 +424,8 @@ class ProductLogic extends BaseLogic @@ -424,8 +424,8 @@ class ProductLogic extends BaseLogic
424 * @time :2023/8/21 17:11 424 * @time :2023/8/21 17:11
425 */ 425 */
426 public function productDelete(){ 426 public function productDelete(){
427 -// DB::connection('custom_mysql')->beginTransaction();  
428 -// try { 427 + DB::connection('custom_mysql')->beginTransaction();
  428 + try {
429 $cateRelate = new CategoryRelated(); 429 $cateRelate = new CategoryRelated();
430 //删除扩展字段 430 //删除扩展字段
431 $extendInfoModel = new ExtendInfo(); 431 $extendInfoModel = new ExtendInfo();
@@ -434,6 +434,7 @@ class ProductLogic extends BaseLogic @@ -434,6 +434,7 @@ class ProductLogic extends BaseLogic
434 if($info['status'] == Product::STATUS_RECYCLE){ 434 if($info['status'] == Product::STATUS_RECYCLE){
435 //删除路由映射 435 //删除路由映射
436 RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']); 436 RouteMap::delRoute(RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
  437 + $this->delRoute($id);
437 //删除当前产品模版 438 //删除当前产品模版
438 // $this->delProductModule($id); 439 // $this->delProductModule($id);
439 $this->model->del(['id'=>$id]); 440 $this->model->del(['id'=>$id]);
@@ -441,16 +442,16 @@ class ProductLogic extends BaseLogic @@ -441,16 +442,16 @@ class ProductLogic extends BaseLogic
441 $cateRelate->del(['product_id'=>$id]); 442 $cateRelate->del(['product_id'=>$id]);
442 $extendInfoModel->del(['product_id'=>$id]); 443 $extendInfoModel->del(['product_id'=>$id]);
443 }else{ 444 }else{
  445 + $this->delRoute($id);
444 //回收站 446 //回收站
445 $this->model->edit(['status'=>Product::STATUS_RECYCLE],['id'=>$id]); 447 $this->model->edit(['status'=>Product::STATUS_RECYCLE],['id'=>$id]);
446 } 448 }
447 - $this->delRoute($id);  
448 } 449 }
449 -// DB::connection('custom_mysql')->commit();  
450 -// }catch (\Exception $e){  
451 -// DB::connection('custom_mysql')->rollBack();  
452 -// $this->fail('删除失败');  
453 -// } 450 + DB::connection('custom_mysql')->commit();
  451 + }catch (\Exception $e){
  452 + DB::connection('custom_mysql')->rollBack();
  453 + $this->fail('删除失败');
  454 + }
454 return $this->success(); 455 return $this->success();
455 } 456 }
456 457