增加show_type

app/Http/Repositories/CmsContentTemplateSetRepository.php

@@ -37,11 +37,13 @@ class CmsContentTemplateSetRepository {
         $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);
@@ -50,11 +52,13 @@ class CmsContentTemplateSetRepository {
         $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);
@@ -87,6 +91,7 @@ class CmsContentTemplateSetRepository {
                 $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);