获取风格列表的接口-根据皮肤变好计数；删除风格接口进行修改；自助建站---流程---5.保存模版；修改状态为未应用

app/JsonRpc/PublicRpcService.php

@@ -667,8 +667,10 @@ class PublicRpcService implements PublicRpcServiceInterface
         $count = $template->count();
         // $countQuery = clone $template;
         $row = $template
-            ->leftJoin('template', 'template_class.id', '=', 'template.template_class_id')
-            ->select('template_class.*', DB::raw('COUNT(template.id) as template_count'))
+            ->leftJoin('template', function ($join) {
+                $join->on('template_class.class_id', '=', 'template.template_class_id');
+            })
+            ->select('template_class.*', DB::raw('COUNT(template.template_class_id) as template_count'))
             ->groupBy('template_class.id')
             ->orderBy('template_class.id', 'desc')
             ->offset(($data['page'] - 1) * $data['pageSize'])
@@ -760,25 +762,35 @@ class PublicRpcService implements PublicRpcServiceInterface
         $where = [
             'id' => $data['id'],
         ];
-        $template = TemplateClass::where($where)->first();
-        if (empty($template)) {
+        $template_class = TemplateClass::where($where)->first();
+        if (empty($template_class)) {
             return Result::error("未查询到风格", 0);
         }
-        if($template->type == 1){
+        if($template_class->type == 1){
             return Result::error("默认风格不能删除", 0);
         }
-        
-        try{
-            // 默认风格   1
-            $template = Template::where('template_class_id',$data['id'])->update(['template_class_id'=>1]);
-            if(empty($template)){
-                Db::rollBack();
-                return Result::error("删除失败", 0);
+        $template = Template::where('template_class_id',$template_class['class_id'])->get();
+        if(!empty($template->all())){
+            try{
+                // 默认风格   1
+                Db::beginTransaction();
+                $template = Template::where('template_class_id',$template['class_id'])->update(['template_class_id'=>1]);
+    
+                if(empty($template)){
+                    Db::rollBack();
+                    return Result::error("删除失败", 0);
+                }
+                $result = TemplateClass::where($where)->delete();
+            }catch (\Exception $e){
+                return Result::error("删除失败".$e->getMessage(), 0);
             }
-            $result = TemplateClass::where($where)->delete();
-        }catch (\Exception $e){
-            return Result::error("删除失败".$e->getMessage(), 0);
+        }else{
+            $result = TemplateClass::where('id',$data['id'])->delete();
         }
+        if(empty($result)){
+            return Result::error("删除失败", 0);
+        }
+
         return Result::success($result);
     }
     /**
@@ -1404,19 +1416,31 @@ class PublicRpcService implements PublicRpcServiceInterface
             return Result::error('请完成之前的步骤！');
         }
         $template_info = WebsiteTemplate::where('website_id', $data['website_id'])->first();
-        var_dump($data['template_data']);
-        if(empty($template_info)){
-            $template = WebsiteTemplate::insertGetId([
-                'website_id' => $data['website_id'],
-                'template_data' => $data['template_data']
-            ]);
-        }else{
-            $template = WebsiteTemplate::where('website_id', $data['website_id'])->update(['template_data' => $data['template_data']]);
-        }
-        if(empty($template)){
-            return Result::error('保存失败！');
-        }else{
-            return Result::success($template);
+        // var_dump($data['template_data']);
+        try{
+            Db::beginTransaction();
+            if(empty($template_info)){
+                $template = WebsiteTemplate::insertGetId([
+                    'website_id' => $data['website_id'],
+                    'template_data' => $data['template_data']
+                ]);
+            }else{
+                $template = WebsiteTemplate::where('website_id', $data['website_id'])->update(['template_data' => $data['template_data']]);
+            }
+            if(empty($template)){
+                Db::rollback();
+                return Result::error('保存失败！');
+            }else{
+                $tempalte_info = WebsiteTemplateInfo::where('website_id', $data['website_id'])->update(['status' => 1]);
+                if(empty($tempalte_info)){
+                    Db::rollback();
+                    return Result::error('保存失败！');
+                }
+                Db::commit();
+            }
+        }catch (\Exception $e){
+            return Result::error('模版数据格式错误！');
         }
+        return Result::success($template);
     }
 }