Merge branch 'pre_release' into 'master'

团餐活动列表已结束列表增加缓存

See merge request bp/goods!69

application/modules/Marketing/controllers/Marketing.php

@@ -187,13 +187,13 @@ class MarketingController extends Base
         $list['prepare'] = $list['prepare'] ? array_column((array)$list['prepare'], null, 'marketing_id') : [];
         $marketingIdsPrepare = array_keys($list['prepare']);
 
-        //已结束的  按结束时间倒序
-        $list['end'] = $this->getTuanCanEndList();
-
         $marketingIds = array_merge($marketingIdsDoing, $marketingIdsPrepare);
 
         $list = $this->_fillSkuAndOrderInfo($marketingIds,$list);
 
+        //已结束的  按结束时间倒序
+        $list['end'] = $this->getTuanCanEndList();
+
         $list['life_account_id'] = MarketingService::getPublicLifeAccountId();
 
         $this->success(['result' => $list]);
@@ -202,7 +202,7 @@ class MarketingController extends Base
     private function getTuanCanEndList(){
         try{
             $redis = RedisUtil::getInstance('cache',['serializer'=>'php']);
-            $key = "tuancan_end_list_".date('Ymd');
+            $key = "tuancan_endlist_".date('Ymd');
             $list['end'] = $redis->get($key);
 
             if(empty($list['end'])) {