Browse Source

record init

zz 6 years ago
parent
commit
622b6e2c30

+ 22 - 0
app/Modules/User/Services/ReadRecordService.php

@@ -511,6 +511,14 @@ class ReadRecordService
         return '';
     }
 
+    public static function getByMultiField(int $uid,...$field){
+        try{
+            return Redis::hmget('book_read:' . $uid,$field);
+        }catch (\Exception $e){
+        }
+        return '';
+    }
+
     public static function setByField(int $uid,$field,$value){
         if(!in_array($field,self::$not_uid_key)){
             return false;
@@ -521,6 +529,20 @@ class ReadRecordService
         return '';
     }
 
+    public static function setByMultiField(int $uid,$kv){
+        $keys = array_keys($kv);
+        foreach ($keys as $field){
+            if(!in_array($field,self::$not_uid_key)){
+                return false;
+            }
+        }
+        try{
+            return Redis::hmset('book_read:' . $uid,$kv);
+        }catch (\Exception $e){}
+        return '';
+    }
+
+
     private static function resetRecordFromDB($uid)
     {
         if(self::getByField($uid,'last_read')){

+ 174 - 121
app/Modules/User/Services/UserSignService.php

@@ -30,10 +30,10 @@ class UserSignService
         //return UserSign::isSign($uid, $day);
         $sign_day = ReadRecordService::getSignDay($uid);
         //异常
-        if($sign_day == -1){
+        if ($sign_day == -1) {
             return true;
         }
-        if($sign_day && $sign_day == date('Y-m-d')){
+        if ($sign_day && $sign_day == date('Y-m-d')) {
             return true;
         }
         return false;
@@ -46,20 +46,21 @@ class UserSignService
      * @param $day
      * @return mixed
      */
-    public static function isSigni($uid, $day){
-        $day_2 = date('Y-m-d',strtotime($day)-86400*2);
-        $sign_stat = UserSign::where('uid',$uid)->where('day','>=',$day_2)->select('day')->orderBy('id','desc')->limit(3)->get();
+    public static function isSigni($uid, $day)
+    {
+        $day_2 = date('Y-m-d', strtotime($day) - 86400 * 2);
+        $sign_stat = UserSign::where('uid', $uid)->where('day', '>=', $day_2)->select('day')->orderBy('id', 'desc')->limit(3)->get();
 
-        if(!$sign_stat->isEmpty()){
-            $day_1 = date('Y-m-d',strtotime($day)-86400);
+        if (!$sign_stat->isEmpty()) {
+            $day_1 = date('Y-m-d', strtotime($day) - 86400);
             $sign_day = [];
-            foreach ($sign_stat as $v){
+            foreach ($sign_stat as $v) {
                 $sign_day[] = $v->day;
             }
-            if(in_array($day,$sign_day)){
+            if (in_array($day, $sign_day)) {
                 return 0;
             }
-            if( in_array($day_1,$sign_day) && in_array($day_2,$sign_day)){
+            if (in_array($day_1, $sign_day) && in_array($day_2, $sign_day)) {
                 return 50;
             }
             return 30;
@@ -70,7 +71,8 @@ class UserSignService
     /**
      * 用户签到记录
      */
-    public static function getUserSignRecord($uid){
+    public static function getUserSignRecord($uid)
+    {
         return UserSign::getUserSignRecord($uid);
     }
 
@@ -82,123 +84,170 @@ class UserSignService
      */
     public static function sign($uid, $day)
     {
-    	\Log::info('sign:uid:'.$uid.' day:'.$day);
+        \Log::info('sign:uid:' . $uid . ' day:' . $day);
         //查看签到日期
         $sign_day = ReadRecordService::getSignDay($uid);
-        if($sign_day == -1){
+        if ($sign_day == -1) {
             return false;
         }
         //已经签过到
-        if($sign_day == $day){
+        if ($sign_day == $day) {
             return false;
         }
 
         $count = ReadRecordService::getSignCountSimple($uid);
         //记录签到日期
-        if($sign_day && $sign_day == date('Y-m-d',time()-86400)){
+        if ($sign_day && $sign_day == date('Y-m-d', time() - 86400)) {
             $continue = true;
             //昨天有签过到
-            ReadRecordService::sign((int)$uid,true);
+            ReadRecordService::sign((int)$uid, true);
             $count += 1;
-        }else{
+        } else {
             $continue = false;
             //昨天没有签过到
-            ReadRecordService::sign((int)$uid,false);
+            ReadRecordService::sign((int)$uid, false);
             $count = 1;
         }
 
         $return_fee = $fee = 30;
         //连续签到两天 50书币
-        if($continue && $count>=3){
+        if ($continue && $count >= 3) {
             $return_fee = $fee = 50;
         }
-        if($count%15 == 7){
+        if ($count % 15 == 7) {
             $fee += 100;
         }
-        if($count%15 == 0){
+        if ($count % 15 == 0) {
             $fee += 150;
         }
         UserService::addBalance($uid, $fee, 0, $fee);
         // 先扔到redis里面,异步更新user_sign表
         $use_redis_user_sign = true;
-        if($use_redis_user_sign){
-        	$sign_data = ['uid'=>$uid,'price'=>$fee,'day'=>$day,'sign_time'=>time(),'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
-        	Redis::sadd('user_sign:uid',$uid);
-        	Redis::hset('user_sign:uid:info',$uid,json_encode($sign_data));
-            ReadRecordService::setSignInfo($uid,json_encode($sign_data));
-        }else{
-        	UserSign::sign($uid, $day,$fee);
+        if ($use_redis_user_sign) {
+            $sign_data = ['uid' => $uid, 'price' => $fee, 'day' => $day, 'sign_time' => time(), 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')];
+            Redis::sadd('user_sign:uid', $uid);
+            Redis::hset('user_sign:uid:info', $uid, json_encode($sign_data));
+            ReadRecordService::setSignInfo($uid, json_encode($sign_data));
+        } else {
+            UserSign::sign($uid, $day, $fee);
         }
         return $return_fee;
     }
 
     public static function signV2($uid, $day)
     {
-        \Log::info('signv2:uid:'.$uid.' day:'.$day);
+        \Log::info('signv2:uid:' . $uid . ' day:' . $day);
         //查看签到日期
         $sign_day = ReadRecordService::getSignDay($uid);
-        if($sign_day == -1){
+        if ($sign_day == -1) {
             return false;
         }
         //已经签过到
-        if($sign_day == $day){
+        if ($sign_day == $day) {
             return false;
         }
 
         $count = ReadRecordService::getSignCountSimple($uid);
         //记录签到日期
-        if($sign_day && $sign_day == date('Y-m-d',time()-86400)){
+        if ($sign_day && $sign_day == date('Y-m-d', time() - 86400)) {
             $continue = true;
             //昨天有签过到
-            ReadRecordService::sign((int)$uid,true);
+            ReadRecordService::sign((int)$uid, true);
             $count += 1;
-        }else{
+        } else {
             $continue = false;
             //昨天没有签过到
-            ReadRecordService::sign((int)$uid,false);
+            ReadRecordService::sign((int)$uid, false);
             $count = 1;
         }
 
         $fee = 30;
-        if($count % 7 == 1){
+        if ($count % 7 == 1) {
             $fee = 30;
-        }elseif($count % 7 == 3){
+        } elseif ($count % 7 == 3) {
             $fee = 120;
-        }elseif ($count % 7 == 0){
+        } elseif ($count % 7 == 0) {
             $fee = 150;
-        }else{
+        } else {
             $fee = 50;
         }
         UserService::addBalance($uid, $fee, 0, $fee);
         // 先扔到redis里面,异步更新user_sign表
         $use_redis_user_sign = true;
-        if($use_redis_user_sign){
-            $sign_data = ['uid'=>$uid,'price'=>$fee,'day'=>$day,'sign_time'=>time(),'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
-            Redis::sadd('user_sign:uid',$uid);
-            Redis::hset('user_sign:uid:info',$uid,json_encode($sign_data));
-            ReadRecordService::setSignInfo($uid,json_encode($sign_data));
-        }else{
-            UserSign::sign($uid, $day,$fee);
+        if ($use_redis_user_sign) {
+            $sign_data = ['uid' => $uid, 'price' => $fee, 'day' => $day, 'sign_time' => time(), 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')];
+            Redis::sadd('user_sign:uid', $uid);
+            Redis::hset('user_sign:uid:info', $uid, json_encode($sign_data));
+            ReadRecordService::setSignInfo($uid, json_encode($sign_data));
+        } else {
+            UserSign::sign($uid, $day, $fee);
         }
         return $fee;
     }
 
     public static function getUserSignVersion($uid)
     {
-        $version = ReadRecordService::getByField($uid,'sign_version');
-        if($version){
-            return $version;
+        list($version, $sign_day, $count) = ReadRecordService::getByMultiField($uid, 'sign_version', 'sign_day', 'sign_counts');
+        if ($version == 'v2') {
+            return 'v2';
         }
-        $count = ReadRecordService::getSignCountSimple($uid);
+        if ($version == 'v1') {
+            if ($sign_day == date('Y-m-d')) {
+                return $version;
+            }
+            if ($sign_day == date('Y-m-d', time() - 86400)) {
+                if ($count % 15 == 0) {
+                    ReadRecordService::setByMultiField($uid, ['sign_counts' => 0, 'sign_version' => 'v2']);
+                    return 'v2';
+                }
+                return $version;
+            }
+
+            ReadRecordService::setByMultiField($uid, ['sign_version' => 'v2']);
+            return 'v2';
+        }
+
+        if (!$count || !$sign_day) {
+            ReadRecordService::setByMultiField($uid, ['sign_version' => 'v2']);
+            return 'v2';
+        }
+
+        if ($sign_day == date('Y-m-d')) {
+            self::setUserSignVersion($uid, 'v1');
+            return 'v1';
+        }
+
+        if ($sign_day == date('Y-m-d', time() - 86400)) {
+            if ($count % 15 == 0) {
+                ReadRecordService::setByMultiField($uid, ['sign_counts' => 0, 'sign_version' => 'v2']);
+                return 'v2';
+            }
+            self::setUserSignVersion($uid, 'v1');
+            return 'v1';
+        }
+
+        self::setUserSignVersion($uid, 'v2');
+        return 'v2';
     }
 
-    public static function setUserSignVersion()
+    public static function setUserSignVersion($uid, $version)
     {
-
+        ReadRecordService::setByField($uid, 'sign_version', $version);
     }
 
-    public static function signToday($uid){
-        return self::sign($uid,date('Y-m-d'));
+    public static function signToday($uid,$version='')
+    {
+        if(!$version){
+            $version = self::getUserSignVersion($uid);
+        }
+         if($version == 'v1'){
+             return self::sign($uid, date('Y-m-d'));
+         }
+
+        if($version == 'v2'){
+            return self::signV2($uid, date('Y-m-d'));
+        }
+        return 0;
     }
 
 
@@ -209,28 +258,28 @@ class UserSignService
      * @param int $price
      * @return string
      */
-    public static function userSignReturnContent3($openid,$distribution_channel_id='')
+    public static function userSignReturnContent3($openid, $distribution_channel_id = '')
     {
         $content = '';
         $day = date('Y-m-d');
         $user = ForceSubscribeUsers::getOneForceSubscribeUsersByOpenid($openid);
         if ($user) {
-            $user_wechat = User::where('id',$user->uid)->first();
+            $user_wechat = User::where('id', $user->uid)->first();
             $new_user_activity_content = '';
-            if(!Order::where('uid',$user->uid)->where('status','PAID')->select('id')->first()){
+            if (!Order::where('uid', $user->uid)->where('status', 'PAID')->select('id')->first()) {
                 $new_user_activity_content = self::newUserActivity($user);
             }
             $encode_distribution_channel_id = encodeDistributionChannelId($user->distribution_channel_id);
-            $attach_content = self::signCallBackPushActivityInfo($user->uid,$user->distribution_channel_id);
+            $attach_content = self::signCallBackPushActivityInfo($user->uid, $user->distribution_channel_id);
             $continueReadUrl = env('PROTOCOL') . '://site' . $encode_distribution_channel_id . '.' . env('WECHAT_CUSTOM_HOST') . '.com/continue';
             $sign_url = env('PROTOCOL') . '://site' . $encode_distribution_channel_id . '.' . env('WECHAT_CUSTOM_HOST') . '.com/sign';
 
             $sign_stat = self::isSign($user->uid);
             if ($sign_stat) {
-                $content = '今日已经签到过了,明日继续签到得书币哦~' ;
+                $content = '今日已经签到过了,明日继续签到得书币哦~';
                 //$content .= '<a href=' . '"' . $continueReadUrl . '"' . '> ☞ 点我继续上次阅读</a>';
-            }else{
-                $content = '尊敬的会员:'.($user_wechat?$user_wechat->nickname:'')."\n\n"."<a href='".$sign_url."'>💰点击此处签到领书币</a>" ; 
+            } else {
+                $content = '尊敬的会员:' . ($user_wechat ? $user_wechat->nickname : '') . "\n\n" . "<a href='" . $sign_url . "'>💰点击此处签到领书币</a>";
                 //$content .= '继续阅读\n\n<a href=' . '"' . $continueReadUrl . '"' . '> ☞ 点我继续上次阅读</a>';
             }
 
@@ -256,7 +305,7 @@ class UserSignService
             }
 
             $hot_book_num = 3;
-            $recomm_books = BookConfigService::getSignRecommendBooks($read_bid_arr, $sign_recomm_bid_key,$hot_book_num);
+            $recomm_books = BookConfigService::getSignRecommendBooks($read_bid_arr, $sign_recomm_bid_key, $hot_book_num);
             $content .= "\n\n" . '热门书籍推荐';
             if ($recomm_books) {
                 foreach ($recomm_books as $book) {
@@ -265,76 +314,79 @@ class UserSignService
                 }
             }
             //$content .= "\n\n" . '为方便下次阅读,请置顶公众号';
-            $content .= "\n\n" . '为方便下次阅读,请<a href="'.'https://help.'. env('WECHAT_CUSTOM_HOST') .'.com/top.html"'.'>置顶公众号</a>';
+            $content .= "\n\n" . '为方便下次阅读,请<a href="' . 'https://help.' . env('WECHAT_CUSTOM_HOST') . '.com/top.html"' . '>置顶公众号</a>';
 
-            if($attach_content){
-                $content .= "\n\n" .$attach_content;
+            if ($attach_content) {
+                $content .= "\n\n" . $attach_content;
             }
-            if($new_user_activity_content){
+            if ($new_user_activity_content) {
                 $content .= $new_user_activity_content;
             }
-        }
-        // 空用户推默认的文案
-        else{
-        	$encode_distribution_channel_id = encodeDistributionChannelId($distribution_channel_id);
-        	$url = env('PROTOCOL') . '://site' . $encode_distribution_channel_id . '.' . env('WECHAT_CUSTOM_HOST') . '.com/sign';
-        	$content = "尊敬的会员:\n\n" . '<a href="' . $url . '"> 💰点击此处签到领书币</a>';
+        } // 空用户推默认的文案
+        else {
+            $encode_distribution_channel_id = encodeDistributionChannelId($distribution_channel_id);
+            $url = env('PROTOCOL') . '://site' . $encode_distribution_channel_id . '.' . env('WECHAT_CUSTOM_HOST') . '.com/sign';
+            $content = "尊敬的会员:\n\n" . '<a href="' . $url . '"> 💰点击此处签到领书币</a>';
         }
         return $content;
     }
 
-    private static function newUserActivity($user){
+    private static function newUserActivity($user)
+    {
         $content = '';
         $status = self::newUserActivityStatus($user->uid);
         $record = [];
         //新关未付费用户42小时后充推送活动 68元的活动 文案:全年免费看书
-        if(strtotime($user->created_at)+42*3600 < time() &&
+        if (strtotime($user->created_at) + 42 * 3600 < time() &&
             $user->distribution_channel_id == 123 &&
-            !in_array(1,$status)
-        ){
-            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($user->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/sale/seYearActivity?fromtype=signcallback_forever&send_time='.time() ;
-            $content .=  "\n\n" .'<a href="' . $url . '"> 💰全年免费看书</a>';
-            $record[] = ['uid'=>$user->uid,'type'=>1,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+            !in_array(1, $status)
+        ) {
+            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($user->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/sale/seYearActivity?fromtype=signcallback_forever&send_time=' . time();
+            $content .= "\n\n" . '<a href="' . $url . '"> 💰全年免费看书</a>';
+            $record[] = ['uid' => $user->uid, 'type' => 1, 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')];
         }
         //20小时的 文字链的文案:书币充值特惠
-        if(strtotime($user->created_at)+20*3600 < time() && !in_array(2,$status)){
-            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($user->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/sale/newUserSale?fromtype=signcallback_newUserSale&send_time='.time() ;
-            $content .=  "\n\n" .'<a href="' . $url . '"> 💰书币充值特惠</a>';
-            $record[] = ['uid'=>$user->uid,'type'=>2,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+        if (strtotime($user->created_at) + 20 * 3600 < time() && !in_array(2, $status)) {
+            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($user->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/sale/newUserSale?fromtype=signcallback_newUserSale&send_time=' . time();
+            $content .= "\n\n" . '<a href="' . $url . '"> 💰书币充值特惠</a>';
+            $record[] = ['uid' => $user->uid, 'type' => 2, 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')];
         }
         //36小时的。文案:充9.9送2000书币
-        if(strtotime($user->created_at)+36*3600 < time() && !in_array(3,$status)){
-            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($user->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/sale/newUserActivity?fromtype=signcallback_newUserActivity&send_time='.time() ;
-            $content .=  "\n\n" .'<a href="' . $url . '"> 💰充9.9得2000书币</a>';
-            $record[] = ['uid'=>$user->uid,'type'=>3,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+        if (strtotime($user->created_at) + 36 * 3600 < time() && !in_array(3, $status)) {
+            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($user->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/sale/newUserActivity?fromtype=signcallback_newUserActivity&send_time=' . time();
+            $content .= "\n\n" . '<a href="' . $url . '"> 💰充9.9得2000书币</a>';
+            $record[] = ['uid' => $user->uid, 'type' => 3, 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')];
         }
         self::recordnewUserActivityPush($record);
         return $content;
     }
 
-    private static function  newUserActivityStatus($uid){
+    private static function newUserActivityStatus($uid)
+    {
         $data = [-1];
-        if(!$uid){
+        if (!$uid) {
             return $data;
         }
-        $result = DB::table('user_sign_push_activity')->where('uid',$uid)->select('type')->get();
-        if($result){
-            foreach ($result as $v){
-                array_push($data,$v->type);
+        $result = DB::table('user_sign_push_activity')->where('uid', $uid)->select('type')->get();
+        if ($result) {
+            foreach ($result as $v) {
+                array_push($data, $v->type);
             }
         }
         return $data;
     }
 
-    private static function recordnewUserActivityPush($data){
-        if($data){
-            try{
+    private static function recordnewUserActivityPush($data)
+    {
+        if ($data) {
+            try {
                 DB::table('user_sign_push_activity')->insert($data);
-            }catch (\Exception $e){
+            } catch (\Exception $e) {
 
             }
         }
     }
+
     /**
      *
      * @param $openid
@@ -356,17 +408,17 @@ class UserSignService
                     $content .= "\n\n" .$attach_content;
                 }*/
                 //return $content;
-            }else{
+            } else {
                 $sign_stat = self::sign($user->uid, $day);
 
-                $content = '今日签到成功,赠送'.$sign_stat.'书币,明日继续签到得书币哦~' . "\n\n" . '<a href=' . '"' . $continueReadUrl . '"' . '> >>点我继续上次阅读</a>' . "\n\n" . '阅读记录:';
+                $content = '今日签到成功,赠送' . $sign_stat . '书币,明日继续签到得书币哦~' . "\n\n" . '<a href=' . '"' . $continueReadUrl . '"' . '> >>点我继续上次阅读</a>' . "\n\n" . '阅读记录:';
 
-                if($sign_stat == 30){
+                if ($sign_stat == 30) {
                     $content = '今日签到成功,赠送30书币,连续签到2日后,赠送书币增加至50哦~' . "\n\n" . '<a href=' . '"' . $continueReadUrl . '"' . '> >>点我继续上次阅读</a>' . "\n\n" . '阅读记录:';
                 }
             }
             $new_user_activity_content = '';
-            if(!Order::where('uid',$user->uid)->where('status','PAID')->select('id')->first()){
+            if (!Order::where('uid', $user->uid)->where('status', 'PAID')->select('id')->first()) {
                 $new_user_activity_content = self::newUserActivity($user);
             }
             $res = ReadRecordService::getReadRecord($user->uid);
@@ -399,48 +451,49 @@ class UserSignService
                 }
             }
             //$content .= "\n\n" . '为方便下次阅读,请置顶公众号';
-            $content .= "\n\n" . '为方便下次阅读,请<a href="'.'https://help.leyuee.com/top.html"'.'>置顶公众号</a>';
+            $content .= "\n\n" . '为方便下次阅读,请<a href="' . 'https://help.leyuee.com/top.html"' . '>置顶公众号</a>';
 
 
-            if($attach_content){
-                $content .= "\n\n" .$attach_content;
+            if ($attach_content) {
+                $content .= "\n\n" . $attach_content;
             }
 
-            if($new_user_activity_content){
-                $content .= "\n\n" .$new_user_activity_content;
+            if ($new_user_activity_content) {
+                $content .= "\n\n" . $new_user_activity_content;
             }
         }
         return $content;
     }
 
-    public static function signCallBackPushActivityInfo($uid,$distribution_channel_id){
+    public static function signCallBackPushActivityInfo($uid, $distribution_channel_id)
+    {
 
         $activity_setting = ActivityService::getActivitySetting();
-        if(!$activity_setting)
+        if (!$activity_setting)
             return false;
-        $acyivity_id = isset($activity_setting['activity_id'])?$activity_setting['activity_id']:0;
-        $other = env('OTHER_ACTIVITY_ID',0);
-        if($acyivity_id == $other && !in_array($distribution_channel_id,explode(',', env('OTHER_ACTIVITY_CHANNEL', '1')))){
+        $acyivity_id = isset($activity_setting['activity_id']) ? $activity_setting['activity_id'] : 0;
+        $other = env('OTHER_ACTIVITY_ID', 0);
+        if ($acyivity_id == $other && !in_array($distribution_channel_id, explode(',', env('OTHER_ACTIVITY_CHANNEL', '1')))) {
             return false;
         }
-        if(!$acyivity_id)
+        if (!$acyivity_id)
             return false;
-        $activity_title = isset($activity_setting['sign_call_back_text'])?$activity_setting['sign_call_back_text']:'';;
-        if(empty($activity_title))
+        $activity_title = isset($activity_setting['sign_call_back_text']) ? $activity_setting['sign_call_back_text'] : '';;
+        if (empty($activity_title))
             return false;
         $activity_info = ActivityService::getById($acyivity_id);
-        if(empty($activity_info))
+        if (empty($activity_info))
             return false;
 
-        if(time()< strtotime($activity_info->start_time) || time()> strtotime($activity_info->end_time)){
+        if (time() < strtotime($activity_info->start_time) || time() > strtotime($activity_info->end_time)) {
             return false;
 
         }
         $user = UserService::getById($uid);
-        if(empty($user))
+        if (empty($user))
             return false;
 
-        if(!ActivitySwitchService::isShowInPage($acyivity_id,$distribution_channel_id,'sign')){
+        if (!ActivitySwitchService::isShowInPage($acyivity_id, $distribution_channel_id, 'sign')) {
             return false;
         }
         /*
@@ -448,9 +501,9 @@ class UserSignService
         if($no_participate_activity && in_array($user->distribution_channel_id, explode(',',$no_participate_activity))){
             return false;
         }*/
-        if($user && isset($user->created_at) && (time() - strtotime($user->created_at)) >= 86400*2) {
-            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com'.$activity_info->activity_page . '&fromtype=signcallback' ;
-            return   '<a href="' . $url . '"> ' . $activity_title . '</a>';
+        if ($user && isset($user->created_at) && (time() - strtotime($user->created_at)) >= 86400 * 2) {
+            $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com' . $activity_info->activity_page . '&fromtype=signcallback';
+            return '<a href="' . $url . '"> ' . $activity_title . '</a>';
         }
 
         return false;