Merge branch 'develop'

app/Repositories/CmsContentTemplateSetRepository.php

@@ -340,17 +340,17 @@ class CmsContentTemplateSetRepository
         $pro_array = $product->toArray();
         $res_id = implode(",", array_column($pro_array, 'product_id'));
 
-        $field_order = intval($request['field_order']) ?? 0;
         $product_key = config('constants.CMS_PRODUCTS');
+        $product_keys = '';
         if (isset($request['field_order'])) {
             $field_order = intval($request['field_order']);
-            if ($field_order == 2){
-                $product_keys = sprintf($product_key, md5($res_id . 2));
-            }else{
-                $product_keys = sprintf($product_key, md5($res_id . 3));
+            if ($field_order == 2) {
+                $product_keys = md5($product_key . 'one' . $res_id);
+            } elseif ($field_order == 3) {
+                $product_keys = md5($product_key . 'two' . $res_id);
             }
         } else {
-            $product_keys = sprintf($product_key, md5($res_id));
+            $product_keys = md5($product_key . $res_id);
         }
 
         Log::info(Redis::exists($product_keys));
@@ -365,7 +365,7 @@ class CmsContentTemplateSetRepository
             if (isset($request['field_order'])) {
                 $sign = generateSign(['ids' => $res_id, 'field_order' => intval($request['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()]
+                    'json' => ['sign' => $sign, 'ids' => $res_id, 'field_order' => intval($request['field_order'])], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
                 ];
             } else {
                 $sign = generateSign(['ids' => $res_id], config('customer.app_secret'));
@@ -376,9 +376,7 @@ class CmsContentTemplateSetRepository
 
             $url = config("customer.app_service_url") . '/product/exchange/subject';
             $http = http($url, $array, 'get');
-//            if (!Cache::has($product_keys)) {
-//                Cache::store('redis')->put($product_keys, $http, 600);//10分钟过期
-//            }
+
             if (!Redis::exists($product_keys)) {
                 Redis::setex($product_keys, 300, json_encode($http));//5分钟过期
                 Log::debug('专题商品缓存存储成功-' . json_encode($http));