Merge branch 'develop'

app/Repositories/CmsContentTemplateSetRepository.php

@@ -340,10 +340,15 @@ class CmsContentTemplateSetRepository
         $pro_array = $product->toArray();
         $res_id = implode(",", array_column($pro_array, 'product_id'));
 
-        $field_order = $request['field_order'] ?? '';
+        $field_order = intval($request['field_order']) ?? 0;
         $product_key = config('constants.CMS_PRODUCTS');
-        if (isset($field_order)) {
-            $product_keys = sprintf($product_key, md5($res_id . $field_order));
+        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));
+            }
         } else {
             $product_keys = sprintf($product_key, md5($res_id));
         }
@@ -357,8 +362,8 @@ class CmsContentTemplateSetRepository
         }
 
         try {
-            if (isset($field_order)) {
-                $sign = generateSign(['ids' => $res_id, 'field_order' => $field_order], config('customer.app_secret'));
+            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()]
                 ];