Merge branch 'develop'

app/Repositories/CmsContentTemplateSetRepository.php

@@ -340,12 +340,13 @@ class CmsContentTemplateSetRepository
         $pro_array = $product->toArray();
         $res_id = implode(",", array_column($pro_array, 'product_id'));
 
-        $field_order = $request['field_order'] ?? '';
+        $field_order = $request['field_order'];
         $product_key = config('constants.CMS_PRODUCTS');
-        $product_keys = sprintf($product_key,md5($res_id.$field_order));
-//        if (Cache::has($product_keys)) {
-//            return Cache::store('redis')->get($product_key);
-//        }
+        if (isset($field_order)) {
+            $product_keys = sprintf($product_key, md5($res_id . $field_order));
+        } else {
+            $product_keys = sprintf($product_key, md5($res_id));
+        }
 
         Log::info(Redis::exists($product_keys));
         if (Redis::exists($product_keys)) {
@@ -356,8 +357,7 @@ class CmsContentTemplateSetRepository
         }
 
         try {
-            if (isset($request['field_order'])) {
-                $field_order = $request['field_order'];
+            if (isset($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()]