Merge remote-tracking branch 'origin/develop' into develop

app/Http/Controllers/CmsContentTemplateSetController.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
+use App\Models\CmsSubject;
 use App\Repositories\CmsContentTemplateSetRepository;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
@@ -33,6 +34,13 @@ class CmsContentTemplateSetController extends BaseController
 
     }
 
+    //兑换商城首页预览
+    public function exchangeMall(Request $request)
+    {
+        return  $this->jsonSuccess($this->cmsContentSetTemplate->exchangeMall($request->all()));
+
+    }
+
     /**
      * 获取城市模板名称及类型
      * @param Request $request
@@ -66,6 +74,29 @@ class CmsContentTemplateSetController extends BaseController
         }
     }
 
+    //获取某专题下的列表
+    public function getProducts(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'subject_id' => 'required|integer',
+        ]);
+        if ($validator->fails()) {
+            return $this->jsonError($validator->errors()->first());
+        }
+        $get_subject = CmsSubject::select('title', 'subject_img')->where('id', $request['subject_id'])->first();
+        if (!$get_subject) {
+            return $this->jsonError('专题ID不正确');
+        }
+        $product_list = $this->cmsContentSetTemplate->getProducts($request->all());
+        if (count($product_list) > 0) {
+            $data = [];
+            $data['subject_title'] = $get_subject->title ?? '';
+            $data['subject_img'] = $get_subject->subject_img ?? '';
+            $data['products'] = $product_list['products'];
 
-
+            return $this->jsonSuccess($data);
+        } else {
+            return $this->jsonError('没有找到对应商品');
+        }
+    }
 }

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)
@@ -170,4 +170,147 @@ class CmsContentTemplateSetRepository
         }
 
     }
+
+    /**
+     * 内容预览
+     */
+    public function exchangeMall($request)
+    {
+        $where = [
+            'city_id' => 0,
+            'apply_type' => 2,
+            '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_array['apply_type'] = "exchangeMall";
+        $group_array['title'] = $temalates->title;
+        $group_array['content'] = [];
+        $exchange_key = config('constants.CMS_EXCHANGE');
+        if (Cache::has($exchange_key)) {
+            return Cache::store('redis')->get($exchange_key);
+        }
+
+        $banner_rule = $this->cmsContentTemplateSet->select('id', 'rule')->where(['tpl_id' => $temalates->id, 'area_type' => 0, 'status' => 1])->limit(1)->first();
+        $new_rule = [];
+        if (isset($banner_rule->rule)){
+            $decode_banner = \GuzzleHttp\json_decode($banner_rule->rule, true);
+            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;
+        }
+
+        $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]['floor_img'] = $v['floor_img'];
+                $new_rule[$k]['id'] = intval($v['id']);
+                $new_rule[$k]['rule'] = $decode_subject;
+            }
+        }
+        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]['floor_img'] = $new_rule[$k]['floor_img'];
+            $group_array['content'][$k + 1]['rule'] = $new_rule[$k]['rule'];
+        }
+
+        $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_rule[$key]['id'] = $val['id'];
+                $new_rule[$key]['show_type'] = intval($show_type->show_type) ?? '';
+                $new_rule[$key]['url'] = $rule['url'];
+                $new_rule[$key]['link_url'] = intval($rule['link_url']);
+                $new_rule[$key]['link_type'] = $rule['link_type'];
+                $new_rule[$key]['rule'] = $get_product['products'] ?? [];
+            }
+        }
+        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]['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'];
+        }
+
+        if (!Cache::has($exchange_key)) {
+            Cache::store('redis')->put($exchange_key, $group_array, 600);//10分钟过期
+        }
+
+        return $group_array;
+    }
+
+    function get_product($res_id)
+    {
+        try {
+            $sign = generateSign(['ids' => $res_id], config('customer.app_secret'));
+            $url = config("customer.app_service_url") . '/product/exchange/subject';
+            $array = [
+                'json' => ['sign' => $sign, 'ids' => $res_id], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
+            ];
+
+            return http($url, $array, 'get');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
+
+    public function getProducts($request)
+    {
+        $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 {
+            if (isset($request['field_order'])) {
+                $field_order = $request['field_order'];
+                $sign = generateSign(['ids' => $res_id, 'field_order' => $field_order], config('customer.app_secret'));
+                $array = [
+                    'json' => ['sign' => $sign, 'ids' => $res_id, 'field_order' => $field_order], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
+                ];
+            } else {
+                $sign = generateSign(['ids' => $res_id], config('customer.app_secret'));
+                $array = [
+                    'json' => ['sign' => $sign, 'ids' => $res_id], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
+                ];
+            }
+
+            $url = config("customer.app_service_url") . '/product/exchange/subject';
+            return http($url, $array, 'get');
+        } catch (\Exception $e) {
+            return [];
+        }
+    }
 }

config/constants.php

@@ -7,4 +7,5 @@
 return [
     'CMS_GROUP' => env('REDIS_CMS_GROUP_KEY', 'cms_shop_group'),
     'CMS_MARKET' => env('REDIS_CMS_MARKET_KEY', 'cms_shop_market'),
+    'CMS_EXCHANGE' => env('REDIS_CMS_EXCHANGE_KEY', 'cms_shop_exchange'),
 ];

config/customer.tpl

@@ -4,4 +4,6 @@ return [
     'app_secret' => '{app_secret}',
     'jwt_secret' => '{jwt_secret}',
     'app_service_url' => '{app_service_url}',
+    'cms_subject_one_bgimg' => '{cms_subject_one_bgimg}',
+    'cms_subject_two_bgimg' => '{cms_subject_two_bgimg}',
 ];

routes/api.php

@@ -20,7 +20,7 @@ $api->version('v1', [
     $api->group(['middleware' => ['chxq_jwt_auth','chxq_sign']], function ($api) {
 
     });
-    //仅验签
+
     $api->group(['middleware' => 'chxq_sign'], function ($api) {
         //内容预览
         $api->post('/templateSet/preview', 'CmsContentTemplateSetController@preview');
@@ -30,7 +30,12 @@ $api->version('v1', [
         $api->get('/templateSet/productList', 'CmsContentTemplateSetController@productList');
 
     });
-
+    $api->group(['middleware' => 'chxq_jwt_auth'], function ($api) {
+        //兑换商城首页
+        $api->get('/template/exchange', 'CmsContentTemplateSetController@exchangeMall');
+        //获取左一右二/上一下三专题下的商品
+        $api->get('/subject/products', 'CmsContentTemplateSetController@getProducts');
+    });
 });
 
 $api->version('v1', [