Merge branch 'develop'

app/Http/Controllers/CmsContentTemplateSetController.php

@@ -52,8 +52,7 @@ class CmsContentTemplateSetController extends BaseController
     public function productList(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'id' => 'required|integer',
-            'area_type' => 'required|string',
+            'subject_id' => 'required|integer',
         ]);
         if ($validator->fails()) {
             return $this->jsonError($validator->errors()->first());

app/Repositories/CmsContentTemplateSetRepository.php

@@ -6,6 +6,7 @@ use App\Models\CmsContentTemplate;
 use App\Models\CmsContentTemplateSet;
 use App\Models\CmsSubjectProduct;
 use App\Models\CmsSubject;
+use Illuminate\Support\Facades\Cache;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Tymon\JWTAuth\Facades\JWTAuth;
 
@@ -25,18 +26,33 @@ class CmsContentTemplateSetRepository
      */
     public function preview($request)
     {
-        $temalates = $this->cmsContentTemplate->select('title', 'id')->where(['city_id' => $request['city_id'], 'apply_type' => $request['type'], 'is_open' => 1,'status'=>1])->orderBy('id','desc')->first();
+        $where = [
+            'city_id' => $request['city_id'],
+            'apply_type' => $request['type'],
+            'is_open' => 1,
+            'status'=>1,
+            'deleted_at'=>null
+        ];
+        $temalates = $this->cmsContentTemplate->select('title', 'id')->where($where)->orderBy('id','desc')->first();
         if (!$temalates) {
             throw new HttpException(500, '没有找到对应模板');
         }
 
-        //团购首页
         $group_array = [];
+        $group_key = config('constants.CMS_GROUP');
+        $market_key = config('constants.CMS_MARKET');
+        //团购首页
         if ($request['type'] == 0) {
+            if (Cache::has($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);
+            }
             $group_array['apply_type'] = "market";
             $group_array['title'] = $temalates->title;
             $group_array['content'] = [];
@@ -47,32 +63,37 @@ class CmsContentTemplateSetRepository
         $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) {
-//            $new_rule[$k]['id'] = $v['id'];
-//            $new_rule[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
             $decode_banner = \GuzzleHttp\json_decode($v['rule'], true);
-            foreach ($decode_banner as $key=>$value){
-                $new_rule[$key]['id'] = $key;
-                $new_rule[$key]['rule'] = $value;
-                $new_rule[$key]['rule']['b_id'] = $v['id'];
-
+            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']);
+                    $new_rule[$key]['rule']['link_url'] = strval($value['link_url']);//强转link_url类型
+                }
             }
         }
-
         $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();
 
         $new_rule1 = [];
         foreach ($subject_rule->toArray() as $k => $v) {
             $new_rule1[$k]['id'] = $v['id'];
-            $new_rule1[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
+            $decode_subject = \GuzzleHttp\json_decode($v['rule'], true);
+            $decode_subject['link_url'] = strval($decode_subject['link_url']);//强转link_url类型
+            $new_rule1[$k]['rule'] = $decode_subject;
         }
 
         $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'];
-            $new_rule2[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
+            $decode_floor = \GuzzleHttp\json_decode($v['rule'], true);
+            $decode_floor['link_url'] = strval($decode_floor['link_url']);//强转link_url类型
+            $new_rule2[$k]['rule'] = $decode_floor;
         }
+
         foreach ($new_rule2 as $k => $v) {
             if ($v) {
                 $rules = $v['rule'];
@@ -82,7 +103,7 @@ class CmsContentTemplateSetRepository
                 $pro_array = $product->toArray();
                 $res_id = implode(",", array_column($pro_array, 'product_id'));
                 $new_rule2[$k]['product_id'] = $res_id;
-                $new_rule2[$k]['subject_id'] = $rules['link_url'];
+                $new_rule2[$k]['subject_id'] = strval($rules['link_url']);
                 $new_rule2[$k]['show_type'] = $show_type->show_type ?? '';
                 unset($v['url']);
                 unset($v['show_num']);
@@ -97,20 +118,31 @@ class CmsContentTemplateSetRepository
             $new_rule3 = [];
             foreach ($category_rule->toArray() as $k => $v) {
                 $new_rule3[$k]['id'] = $v['id'];
-                $new_rule3[$k]['rule'] = \GuzzleHttp\json_decode($v['rule'], true);
+                $decode_category = \GuzzleHttp\json_decode($v['rule'], true);
+                $decode_category['link_url'] = strval($decode_category['link_url']);//强转link_url类型
+                $new_rule3[$k]['rule'] = $decode_category;
             }
+
             $group_array['content'][1]['rule'] = $new_rule3;
             $group_array['content'][2]['area_type'] = "special";
             $group_array['content'][2]['rule'] = $new_rule1;
             $group_array['content'][3]['area_type'] = "floor";
             $group_array['content'][3]['rule'] = $new_rule2;
+
+            if (!Cache::has($market_key)) {
+                Cache::store('redis')->put($market_key, $group_array, 600);//10分钟过期
+            }
+
         } else {
             $group_array['content'][1]['area_type'] = "special";
             $group_array['content'][1]['rule'] = $new_rule1;
             $group_array['content'][2]['area_type'] = "floor";
             $group_array['content'][2]['rule'] = $new_rule2;
-        }
 
+            if (!Cache::has($group_key)) {
+                Cache::store('redis')->put($group_key, $group_array, 600);
+            }
+        }
         return $group_array;
     }
 
@@ -121,21 +153,10 @@ class CmsContentTemplateSetRepository
 
     public function productList($request)
     {
-        $area_type = '';
-        if ($request['area_type'] == 'floor') {
-            $area_type = 2;
-        }
-        $template_set = $this->cmsContentTemplateSet->select('rule')->where(['area_type' => $area_type, 'id' => $request['id']])->first();
-        if (!$template_set) {
-            throw new HttpException(500, '没有找到对应模板内容');
-        }
-        $template_array = json_decode($template_set->rule, true);
-
-        $product = $this->cmsSubjectProduct->where('subject_id', $template_array['link_url'])->orderBy('sort', 'asc')->get();
+        $product = $this->cmsSubjectProduct->where('subject_id', $request['subject_id'])->orderBy('sort', 'asc')->get();
         $pro_array = $product->toArray();
         $res_id = implode(",", array_column($pro_array, 'product_id'));
 
-
         try {
             $sign = generateSign(['ids' => $res_id], config('customer.app_secret'));
             $url = config("customer.app_service_url") . '/product/homeProduct';

bootstrap/app.php

@@ -32,6 +32,7 @@ $app->configure('jwt');
 $app->configure('customer');
 $app->configure('elasticsearch');
 $app->configure('database');
+$app->configure('constants');
 /*
 |--------------------------------------------------------------------------
 | Register Container Bindings

config/constants.php

@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * 常量配置
+ */
+
+return [
+    'CMS_GROUP' => env('REDIS_CMS_GROUP_KEY', 'cms_shop_group'),
+    'CMS_MARKET' => env('REDIS_CMS_MARKET_KEY', 'cms_shop_market'),
+];