Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/DAO/SaleMember.php

@@ -98,7 +98,7 @@ class SaleMemberModel extends \DAO\AbstractModel {
      */
     public function isJoinPlatform($memberId){
         //$saleDAO = \DAO\SaleMemberModel::getInstance();
-        $activities = \Our\RedisHelper::cachedFunction(\Redis\Db4\SaleMemberRedisModel::getInstance(),array(&$this, 'getActAndSale'),array(array('han_sale_member.member_id'=>$memberId),'han_sale_activity.sale_act_id,han_sale_activity.sale_start_date,han_sale_activity.sale_end_date,han_sale_member.sale_id'),\Our\ApiConst::tenMinSecond);
+        $activities = \Our\RedisHelper::cachedFunction(\Redis\Db4\SaleMemberRedisModel::getInstance(),array(&$this, 'getActAndSale'),array(array('han_sale_member.member_id'=>$memberId),'han_sale_activity.sale_act_id,han_sale_activity.sale_start_date,han_sale_activity.sale_end_date,han_sale_member.sale_id'),\Our\ApiConst::twoMinSecond);
         $acts = [];
         if($activities){
             foreach ($activities as $k=>$v){