gx

@@ -125,6 +125,20 @@ class ReplaceHtml extends Command
      * @time   :2024/5/10 17:26
      */
     public function createReplaceHtmlLog($info){
+        if($info['is_rollback'] != 0){
+            $saveData = [];
+            $templateHtmlLogModel = new TemplateReplaceHtmlLog();
+            $list = $templateHtmlLogModel->list(['replace_id'=>$info['rollback_id']]);
+            foreach ($list as $value){
+                $value['replace_id'] = $info['id'];
+                $value['is_rollback'] = $info['is_rollback'];
+                $value['old_html'] = $info['old_html'];
+                $value['html'] = $info['html'];
+                $value['created_at'] = date('Y-m-d H:i:s');
+                $value['updated_at'] = date('Y-m-d H:i:s');
+                $saveData[] = $value;
+            }
+        }else{
             $bTemplateModel = new BTemplate();
             $condition = ['is_custom'=>$info['is_custom'], 'is_list'=>$info['is_list'], 'template_id'=>$info['template_id']];
             if($info['source'] != 0){
@@ -139,8 +153,9 @@ class ReplaceHtml extends Command
             $saveData = [];
             foreach ($bTemplateList as $v){
                 $source_id = $v['source'] == 1 ? 0 : $v['source_id'];
-            $name = $this->getSourceName($v['source'],$source_id,$v['is_list'],$v['is_custom']);
-            $saveData[] = $this->saveData($info,$v,$source_id,$name);
+                $name_route = $this->getSourceName($v['source'],$source_id,$v['is_list'],$v['is_custom']);
+                $saveData[] = $this->saveData($info,$v,$source_id,$name_route);
+            }
         }
         if(!empty($saveData)){
             $templateHtmlLogModel = new TemplateReplaceHtmlLog();
@@ -156,7 +171,7 @@ class ReplaceHtml extends Command
      * @method :post
      * @time   :2024/5/13 11:29
      */
-    public function saveData($info,$v,$source_id,$name){
+    public function saveData($info,$v,$source_id,$name_route){
         return [
             'replace_id'=>$info['id'],
             'project_id'=>$info['project_id'],
@@ -169,7 +184,8 @@ class ReplaceHtml extends Command
             'is_list'=>$v['is_list'],
             'is_rollback'=>$info['is_rollback'],
             'template_id'=>$info['template_id'],
-            'source_name'=>$name,
+            'source_name'=>$name_route['name'],
+            'route'=>$name_route['route'],
             'created_at'=>date('Y-m-d H:i:s'),
             'updated_at'=>date('Y-m-d H:i:s')
         ];
@@ -231,6 +247,7 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $cateInfo['name'];
+            $route = $cateInfo['alias'];
         }else{
             $newsModel = new News();
             $newsInfo = $newsModel->read(['id'=>$source_id]);
@@ -238,8 +255,9 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $newsInfo['name'];
+            $route = $newsInfo['url'];
         }
-        return $name;
+        return ['name'=>$name,'route'=>$route];
     }
 
     /**
@@ -257,6 +275,7 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $cateInfo['name'];
+            $route = $cateInfo['alias'];
         }else{
             $blogModel = new Blog();
             $productInfo = $blogModel->read(['id'=>$source_id]);
@@ -264,8 +283,9 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $productInfo['name'];
+            $route = $productInfo['url'];
         }
-        return $name;
+        return ['name'=>$name,'route'=>$route];
     }
 
     /**
@@ -283,6 +303,7 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $cateInfo['title'];
+            $route = $cateInfo['route'];
         }else{
             $productModel = new Product();
             $productInfo = $productModel->read(['id'=>$source_id]);
@@ -290,8 +311,9 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $productInfo['title'];
+            $route = $productInfo['route'];
         }
-        return $name;
+        return ['name'=>$name,'route'=>$route];
     }
 
     /**
@@ -314,6 +336,7 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $cateInfo['name'];
+            $route = $cateInfo['route'];
         }else{
             $contentModel = new CustomModuleContent();
             $contentInfo = $contentModel->read(['id'=>$source_id],['id','name']);
@@ -321,7 +344,8 @@ class ReplaceHtml extends Command
                 return false;
             }
             $name = $contentInfo['name'];
+            $route = $contentInfo['route'];
         }
-        return $name;
+        return ['name'=>$name,'route'=>$route];
     }
 }

@@ -80,7 +80,7 @@ class ReplaceHtmlLog extends Command
     public function replaceHtml($info){
         $source_id = $info['source'] == 1 ? 0 : $info['source_id'];
         $bTemplateModel = new BTemplate();
-        $condition = ['source'=>$info['source'],'source_id'=>$info['source_id'],
+        $condition = ['source'=>$info['source'],'source_id'=>$source_id,
             'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
         $old_html = $info['old_html'];
         $html = $info['html'];