前端预览返回格式调整

app/Repositories/CmsContentTemplateSetRepository.php

@@ -30,10 +30,10 @@ class CmsContentTemplateSetRepository
             'city_id' => $request['city_id'],
             'apply_type' => $request['type'],
             'is_open' => 1,
-            'status'=>1,
-            'deleted_at'=>null
+            'status' => 1,
+            'deleted_at' => null
         ];
-        $temalates = $this->cmsContentTemplate->select('title', 'id')->where($where)->orderBy('id','desc')->first();
+        $temalates = $this->cmsContentTemplate->select('title', 'id')->where($where)->orderBy('id', 'desc')->first();
         if (!$temalates) {
             throw new HttpException(500, '没有找到对应模板');
         }
@@ -44,12 +44,12 @@ class CmsContentTemplateSetRepository
         //团购首页
         if ($request['type'] == 0) {
             if (Cache::has($group_key)) {
-              return Cache::store('redis')->get($group_key);
+                return Cache::store('redis')->get($group_key);
             }
             $group_array['apply_type'] = "group";
             $group_array['title'] = $temalates->title;
             $group_array['content'] = [];
-        }else {//菜市场首页
+        } else {//菜市场首页
             if (Cache::has($market_key)) {
                 return Cache::store('redis')->get($market_key);
             }
@@ -60,12 +60,12 @@ class CmsContentTemplateSetRepository
 
         $group_array['content'][0]['area_type'] = "banner";
 
-        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0,'status'=>1])->get();
+        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0, 'status' => 1])->get();
         $new_rule = [];
         foreach ($banner_rule->toArray() as $k => $v) {
             $decode_banner = \GuzzleHttp\json_decode($v['rule'], true);
-            if (count($decode_banner)>0) {
-                foreach ($decode_banner as $key=>$value){
+            if (count($decode_banner) > 0) {
+                foreach ($decode_banner as $key => $value) {
                     $new_rule[$key]['id'] = $key;
                     $new_rule[$key]['rule'] = $value;
                     $new_rule[$key]['rule']['b_id'] = strval($v['id']);
@@ -75,7 +75,7 @@ class CmsContentTemplateSetRepository
         }
         $group_array['content'][0]['rule'] = $new_rule;
 
-        $subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1,'status'=>1])->get();
+        $subject_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 1, 'status' => 1])->get();
 
         $new_rule1 = [];
         foreach ($subject_rule->toArray() as $k => $v) {
@@ -85,7 +85,7 @@ class CmsContentTemplateSetRepository
             $new_rule1[$k]['rule'] = $decode_subject;
         }
 
-        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
+        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2, 'status' => 1])->get();
         $new_rule2 = [];
         foreach ($floor_rule->toArray() as $k => $v) {
             $new_rule2[$k]['id'] = $v['id'];
@@ -114,7 +114,7 @@ class CmsContentTemplateSetRepository
 
         if ($request['type'] == 1) {
             $group_array['content'][1]['area_type'] = "category";
-            $category_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 3,'status'=>1])->get();
+            $category_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 3, 'status' => 1])->get();
             $new_rule3 = [];
             foreach ($category_rule->toArray() as $k => $v) {
                 $new_rule3[$k]['id'] = $v['id'];
@@ -148,7 +148,7 @@ class CmsContentTemplateSetRepository
 
     public function getTemplate($cityId)
     {
-        return $this->cmsContentTemplate->where(['city_id' => $cityId, 'is_open' => 1,'status'=>1])->where('deleted_at', null)->select('id','title', 'apply_type')->orderBy('apply_type', 'asc')->get();
+        return $this->cmsContentTemplate->where(['city_id' => $cityId, 'is_open' => 1, 'status' => 1])->where('deleted_at', null)->select('id', 'title', 'apply_type')->orderBy('apply_type', 'asc')->get();
     }
 
     public function productList($request)
@@ -180,10 +180,10 @@ class CmsContentTemplateSetRepository
             'city_id' => 0,
             'apply_type' => 2,
             'is_open' => 1,
-            'status'=>1,
-            'deleted_at'=>null
+            'status' => 1,
+            'deleted_at' => null
         ];
-        $temalates = $this->cmsContentTemplate->select('title', 'id')->where($where)->orderBy('id','desc')->first();
+        $temalates = $this->cmsContentTemplate->select('title', 'id')->where($where)->orderBy('id', 'desc')->first();
         if (!$temalates) {
             throw new HttpException(500, '没有找到对应模板');
         }
@@ -193,120 +193,75 @@ class CmsContentTemplateSetRepository
         $group_array['title'] = $temalates->title;
         $group_array['content'] = [];
 
-        $group_array['content'][0]['area_type'] = "banner";
-
-        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0,'status'=>1])->get();
+        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0, 'status' => 1])->limit(1)->first();
+        $decode_banner = \GuzzleHttp\json_decode($banner_rule->rule, true);
         $new_rule = [];
-        foreach ($banner_rule->toArray() as $k => $v) {
-            $decode_banner = \GuzzleHttp\json_decode($v['rule'], true);
-            if (count($decode_banner)>0) {
-                foreach ($decode_banner as $key=>$value){
-                    $new_rule[$key]['id'] = $key;
-                    $new_rule[$key]['rule'] = $value;
-                    $new_rule[$key]['rule']['b_id'] = intval($v['id']);
-                }
+        if (count($decode_banner) > 0) {
+            foreach ($decode_banner as $key => $value) {
+                $new_rule[$key]['url'] = $value['url'];
+                $new_rule[$key]['link_url'] = $value['link_url'];
+                $new_rule[$key]['link_type'] = $value['link_type'];
             }
         }
+        $group_array['content'][0]['area_type'] = "banner";
+        $group_array['content'][0]['id'] = $banner_rule->id ?? 0;
         $group_array['content'][0]['rule'] = $new_rule;
 
-        $subject_one = $this->cmsContentTemplateSet->select('id', 'rule','sort','name')->where(['tpl_id' => $temalates->id, 'area_type' => 4,'status'=>1])->orderBy('id', 'desc')->limit(1)->get();
-        $subject_two = $this->cmsContentTemplateSet->select('id', 'rule','sort','name')->where(['tpl_id' => $temalates->id, 'area_type' => 5,'status'=>1])->limit(1)->get();
-
-        $subject_one_sort = implode(',',array_column($subject_one->toArray(), 'sort'));
-        $subject_two_sort = implode(',',array_column($subject_two->toArray(), 'sort'));
-
-        if (intval($subject_one_sort) <= intval($subject_two_sort)){
-            $group_array['content'][1]['area_type'] = "subject_one";
-            $new_rule = [];
-            foreach ($subject_one->toArray() as $k => $v) {
-                $decode_subject_one = \GuzzleHttp\json_decode($v['rule'], true);
-                if (count($decode_subject_one) > 0) {
-                    foreach ($decode_subject_one as $key=>$value) {
-                        $new_rule[$key]['id'] = $key;
-                        $new_rule[$key]['name'] = $v['name'];
-                        $new_rule[$key]['image'] = config('customer.cms_subject_one_bgimg');
-                        $new_rule[$key]['rule'] = $value;
-                        $new_rule[$key]['rule']['b_id'] = intval($v['id']);
-                    }
-                }
-            }
-            $group_array['content'][1]['rule'] = $new_rule;
-
-            $group_array['content'][2]['area_type'] = "subject_two";
-            $new_rule = [];
-            foreach ($subject_two->toArray() as $k => $v) {
-                $decode_subject_two = \GuzzleHttp\json_decode($v['rule'], true);
-                if (count(json_decode($v['rule'])) > 0) {
-                    foreach ($decode_subject_two as $key=>$value) {
-                        $new_rule[$key]['id'] = $key;
-                        $new_rule[$key]['name'] = $v['name'];
-                        $new_rule[$key]['image'] = config('customer.cms_subject_two_bgimg');
-                        $new_rule[$key]['rule'] = $value;
-                        $new_rule[$key]['rule']['b_id'] = intval($v['id']);
-                    }
-                }
-            }
-            $group_array['content'][2]['rule'] = $new_rule;
-        }else{
-            $group_array['content'][1]['area_type'] = "subject_two";
-            $new_rule = [];
-            foreach ($subject_two->toArray() as $k => $v) {
-                $decode_subject_two = \GuzzleHttp\json_decode($v['rule'], true);
-                if (count(json_decode($v['rule'])) > 0) {
-                    foreach ($decode_subject_two as $key=>$value) {
-                        $new_rule[$key]['id'] = $key;
-                        $new_rule[$key]['name'] = $v['name'];
-                        $new_rule[$key]['image'] = config('customer.cms_subject_two_bgimg');
-                        $new_rule[$key]['rule'] = $value;
-                        $new_rule[$key]['rule']['b_id'] = intval($v['id']);
-                    }
-                }
-            }
-            $group_array['content'][1]['rule'] = $new_rule;
-
-            $group_array['content'][2]['area_type'] = "subject_one";
-            $new_rule = [];
-            foreach ($subject_one->toArray() as $k => $v) {
-                $decode_subject_one = \GuzzleHttp\json_decode($v['rule'], true);
-                if (count($decode_subject_one) > 0) {
-                    foreach ($decode_subject_one as $key=>$value) {
-                        $new_rule[$key]['id'] = $key;
-                        $new_rule[$key]['name'] = $v['name'];
-                        $new_rule[$key]['image'] = config('customer.cms_subject_one_bgimg');
-                        $new_rule[$key]['rule'] = $value;
-                        $new_rule[$key]['rule']['b_id'] = intval($v['id']);
-                    }
+        $all_subject = $this->cmsContentTemplateSet->select('id', 'rule', 'sort', 'name', 'floor_img', 'area_type')->where(['tpl_id' => $temalates->id, 'status' => 1])->whereIn('area_type', [4, 5])->orderBy('sort', 'asc')->get();
+        $all_subject = $all_subject->toArray();
+        $count = count($all_subject);
+        $new_rule = [];
+        foreach ($all_subject as $k => $v) {
+            $decode_subject = \GuzzleHttp\json_decode($v['rule'], true);
+            if (count($decode_subject) > 0) {
+                if ($v['area_type'] == 4) {
+                    $new_rule[$k]['area_type'] = "subject_one";
+                } else {
+                    $new_rule[$k]['area_type'] = "subject_two";
                 }
+                $new_rule[$k]['name'] = $v['name'];
+                $new_rule[$k]['floor_img'] = $v['floor_img'];
+                $new_rule[$k]['id'] = intval($v['id']);
+                $new_rule[$k]['rule'] = $decode_subject;
             }
-            $group_array['content'][2]['rule'] = $new_rule;
         }
-
-        $group_array['content'][3]['area_type'] = "floor";
-        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule','floor_img')->where(['tpl_id' => $temalates->id, 'area_type' => 2,'status'=>1])->get();
-        $new_rule2 = [];
-        foreach ($floor_rule->toArray() as $k => $v) {
-            $new_rule2[$k]['id'] = $v['id'];
-            $new_rule2[$k]['floor_img'] = $v['floor_img'];
-            $decode_floor = \GuzzleHttp\json_decode($v['rule'], true);
-            $new_rule2[$k]['rule'] = $decode_floor;
+        foreach ($new_rule as $k => $v) {
+            $group_array['content'][$k + 1]['area_type'] = $new_rule[$k]['area_type'];
+            $group_array['content'][$k + 1]['id'] = $new_rule[$k]['id'];
+            $group_array['content'][$k + 1]['name'] = $new_rule[$k]['name'];
+            $group_array['content'][$k + 1]['floor_img'] = $new_rule[$k]['floor_img'];
+            $group_array['content'][$k + 1]['rule'] = $new_rule[$k]['rule'];
         }
 
-        foreach ($new_rule2 as $k => $v) {
-            if ($v) {
-                $rules = $v['rule'];
-                $show_type = $this->cmsSubject->select('show_type')->where('id', $rules['link_url'])->first();
-                $product = $this->cmsSubjectProduct->where('subject_id', $rules['link_url'])->orderBy('sort', 'asc')->get();
+        $floor_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 2, 'status' => 1])->orderBy('id', 'asc')->get();
+        $new_rule = [];
+        foreach ($floor_rule->toArray() as $key => $val) {
+            $rule = \GuzzleHttp\json_decode($val['rule'], true);
+            if (count($rule) > 0) {
+                $show_type = $this->cmsSubject->select('show_type')->where('id', intval($rule['link_url']))->first();
+                $product = $this->cmsSubjectProduct->where('subject_id', intval($rule['link_url']))->orderBy('sort', 'asc')->get();
                 $pro_array = $product->toArray();
                 $res_id = implode(",", array_column($pro_array, 'product_id'));
                 $get_product = $this->get_product($res_id);
-                $new_rule2[$k]['products'] = $get_product['products'] ?? [];
-                $new_rule2[$k]['show_type'] = intval($show_type->show_type) ?? '';
-                unset($v['url']);
-                unset($rules['link_url']);
-                unset($v['link_type']);
+                $new_rule[$key]['id'] = $val['id'];
+                $new_rule[$key]['show_type'] = intval($show_type->show_type) ?? '';
+                $new_rule[$key]['url'] = $rule['url'];
+                $new_rule[$key]['title'] = $rule['title'];
+                $new_rule[$key]['link_url'] = intval($rule['link_url']);
+                $new_rule[$key]['link_type'] = $rule['link_type'];
+                $new_rule[$key]['rule'] = $get_product['products'] ?? [];
             }
         }
-        $group_array['content'][3]['rule'] = $new_rule2;
+        foreach ($new_rule as $key => $val) {
+            $group_array['content'][$count + $key + 1]['area_type'] = "floor";
+            $group_array['content'][$count + $key + 1]['id'] = $val['id'];
+            $group_array['content'][$count + $key + 1]['show_type'] = $val['show_type'];
+            $group_array['content'][$count + $key + 1]['floor_img'] = $val['url'];
+            $group_array['content'][$count + $key + 1]['title'] = $val['title'];
+            $group_array['content'][$count + $key + 1]['link_url'] = $val['link_url'];
+            $group_array['content'][$count + $key + 1]['link_type'] = $val['link_type'];
+            $group_array['content'][$count + $key + 1]['rule'] = $val['rule'];
+        }
 
         return $group_array;
     }

routes/api.php

@@ -32,9 +32,9 @@ $api->version('v1', [
     });
     $api->group(['middleware' => 'chxq_jwt_auth'], function ($api) {
         //兑换商城首页
-        $api->get('/templateSet/exchangeMall', 'CmsContentTemplateSetController@exchangeMall');
+        $api->get('/template/exchange', 'CmsContentTemplateSetController@exchangeMall');
         //获取左一右二/上一下三专题下的商品
-        $api->get('/templateSet/getProducts', 'CmsContentTemplateSetController@getProducts');
+        $api->get('/subject/products', 'CmsContentTemplateSetController@getProducts');
     });
 });