Merge branch 'develop'

app/Repositories/CmsContentTemplateSetRepository.php

@@ -305,6 +305,7 @@ class CmsContentTemplateSetRepository
             $group_array['content'][$count + $key + 1]['link_type'] = $val['link_type'];
             $group_array['content'][$count + $key + 1]['rule'] = $val['rule'];
         }
+        $group_array['is_show'] = intval(config('customer.exchange_shop_is_show'));
 
 //        if (!Cache::has($exchange_key)) {
 //            Cache::store('redis')->put($exchange_key, $group_array, 600);//10分钟过期
@@ -315,7 +316,6 @@ class CmsContentTemplateSetRepository
             Log::debug('兑换商城缓存存储成功-' . json_encode($group_array));
         }
 
-        $group_array['is_show'] = intval(config('customer.exchange_shop_is_show'));
         return $group_array;
     }