作者 lyh

gx

@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Bside\Template; @@ -11,6 +11,7 @@ namespace App\Http\Controllers\Bside\Template;
11 11
12 use App\Enums\Common\Code; 12 use App\Enums\Common\Code;
13 use App\Http\Controllers\Bside\BaseController; 13 use App\Http\Controllers\Bside\BaseController;
  14 +use App\Http\Logic\Bside\BTemplate\BTemplateLogLogic;
14 use App\Models\Template\BTemplateLog; 15 use App\Models\Template\BTemplateLog;
15 use App\Models\Template\Template; 16 use App\Models\Template\Template;
16 use App\Models\User\User; 17 use App\Models\User\User;
@@ -45,4 +46,21 @@ class BTemplateLogController extends BaseController @@ -45,4 +46,21 @@ class BTemplateLogController extends BaseController
45 } 46 }
46 $this->response('success',Code::SUCCESS,$lists); 47 $this->response('success',Code::SUCCESS,$lists);
47 } 48 }
  49 +
  50 + /**
  51 + * @remark :回滚版本
  52 + * @name :rollbackVersion
  53 + * @author :lyh
  54 + * @method :post
  55 + * @time :2023/8/23 11:52
  56 + */
  57 + public function rollbackVersion(BTemplateLogLogic $logic){
  58 + $this->request->validate([
  59 + 'id'=>['required'],
  60 + ],[
  61 + 'id.required' => '模版ID不能为空',
  62 + ]);
  63 + $logic->saveRollbackVersion();
  64 + $this->response('success');
  65 + }
48 } 66 }
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :BTemplateLogLogic.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2023/8/23 11:54
  8 + */
  9 +
  10 +namespace App\Http\Logic\Bside\BTemplate;
  11 +
  12 +use App\Http\Logic\Bside\BaseLogic;
  13 +use App\Models\Template\BTemplate;
  14 +use App\Models\Template\BTemplateLog;
  15 +
  16 +class BTemplateLogLogic extends BaseLogic
  17 +{
  18 + public function __construct()
  19 + {
  20 + parent::__construct();
  21 + $this->model = new BTemplateLog();
  22 + $this->param = $this->requestAll;
  23 + }
  24 +
  25 + /**
  26 + * @remark :回滚版本
  27 + * @name :saveRollbackVersion
  28 + * @author :lyh
  29 + * @method :post
  30 + * @time :2023/8/23 11:55
  31 + */
  32 + public function saveRollbackVersion(){
  33 + //获取当前数据详情
  34 + $this->model->read(['id']);
  35 + }
  36 +}
@@ -174,8 +174,8 @@ class BTemplateLogic extends BaseLogic @@ -174,8 +174,8 @@ class BTemplateLogic extends BaseLogic
174 */ 174 */
175 public function templateSave(){ 175 public function templateSave(){
176 //查询当前模版是否已保存 176 //查询当前模版是否已保存
177 - DB::beginTransaction();  
178 - try { 177 +// DB::beginTransaction();
  178 +// try {
179 $info = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],$this->param['source_id']); 179 $info = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],$this->param['source_id']);
180 //字符串截取 180 //字符串截取
181 $this->param = $this->stringProcessing($this->param); 181 $this->param = $this->stringProcessing($this->param);
@@ -186,11 +186,11 @@ class BTemplateLogic extends BaseLogic @@ -186,11 +186,11 @@ class BTemplateLogic extends BaseLogic
186 $this->model->edit($this->param,['id'=>$info['id']]); 186 $this->model->edit($this->param,['id'=>$info['id']]);
187 } 187 }
188 $this->setTemplateLog($this->param); 188 $this->setTemplateLog($this->param);
189 - DB::commit();  
190 - }catch (\Exception $e){  
191 - DB::rollBack();  
192 - $this->fail('error');  
193 - } 189 +// DB::commit();
  190 +// }catch (\Exception $e){
  191 +// DB::rollBack();
  192 +// $this->fail('error');
  193 +// }
194 //通知更新 194 //通知更新
195 $this->homeOrProduct($this->param['source'],$this->param['source_id']); 195 $this->homeOrProduct($this->param['source'],$this->param['source_id']);
196 return $this->success(); 196 return $this->success();