修改多余返回

app/Http/Repositories/CmsContentTemplateSetRepository.php

@@ -35,33 +35,11 @@ class CmsContentTemplateSetRepository {
 
         $group_array['content'][0]['area_type'] ="banner";
         $banner_rule = $this->cmsContentTemplateSet->select('rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>0])->first();
-        $decode_banner = json_decode($banner_rule['rule'],true);
-        foreach ($decode_banner as &$v) {
-            $show_type = $this->cmsSubject->select('show_type')->where('id',$v['link_url'])->first();
-            $product = $this->cmsSubjectProduct->where('subject_id', $v['link_url'])->orderBy('sort', 'asc')->get();
-            $pro_array = $product->toArray();
-            $res_id = implode(",", array_column($pro_array, 'id'));
-            if ($res_id){
-                $v['product_id'] = $res_id;
-                $v['show_type'] = $show_type->show_type;
-            }
-        }
-        $group_array['content'][0]['rule'] = json_encode($decode_banner,JSON_UNESCAPED_UNICODE);
+        $group_array['content'][0]['rule'] = $banner_rule->rule;
 
         $group_array['content'][1]['area_type'] ="special";
         $subject_rule = $this->cmsContentTemplateSet->select('rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>1])->first();
-        $decode_subject = json_decode($subject_rule['rule'],true);
-        foreach ($decode_subject as &$v) {
-            $show_type = $this->cmsSubject->select('show_type')->where('id',$v['link_url'])->first();
-            $product = $this->cmsSubjectProduct->where('subject_id', $v['link_url'])->orderBy('sort', 'asc')->get();
-            $pro_array = $product->toArray();
-            $res_id = implode(",", array_column($pro_array, 'id'));
-            if ($res_id){
-                $v['product_id'] = $res_id;
-                $v['show_type'] = $show_type->show_type;
-            }
-        }
-        $group_array['content'][1]['rule'] = json_encode($decode_subject,JSON_UNESCAPED_UNICODE);
+        $group_array['content'][1]['rule'] = $subject_rule->rule;
 
         $group_array['content'][2]['area_type'] ="floor";
         $floor_rule = $this->cmsContentTemplateSet->select('rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>2])->first();
@@ -84,17 +62,7 @@ class CmsContentTemplateSetRepository {
         if ($request['type'] == 1){
             $group_array['content'][3]['area_type'] ="category";
             $category_rule = $this->cmsContentTemplateSet->select('rule')->where(['tpl_id'=>$request['tpl_id'],'area_type'=>3])->first();
-            $decode_category = json_decode($category_rule['rule'],true);
-            foreach ($decode_category as &$v) {
-                $product = $this->cmsSubjectProduct->where('subject_id', $v['link_url'])->orderBy('sort', 'asc')->get();
-                $pro_array = $product->toArray();
-                $res_id = implode(",", array_column($pro_array, 'id'));
-                if ($res_id){
-                    $v['product_id'] = $res_id;
-                    $v['show_type'] = $show_type->show_type;
-                }
-            }
-            $group_array['content'][3]['rule'] = json_encode($decode_floor,JSON_UNESCAPED_UNICODE);
+            $group_array['content'][3]['rule'] = $category_rule->rule;
         }
 
         foreach ($group_array['content'] as $key=>$value){