增加发送者可以随时查看红包详情，修复释放红包错误

crontab/control/hour.php

@@ -254,7 +254,7 @@ class hourControl extends BaseCronControl
         $one_hour = 60 * 60;
         $condition = array('remain_amount' => array('gt',0),'is_refund' => 0,'send_end_date' =>array('lt',time() - $one_hour));
         $bonus_types = $bonus_type->getTypeList($condition,'','*','',false);
-        if(empty($bonus_types) || count($bonus_types)) {
+        if(empty($bonus_types) || count($bonus_types) <= 0) {
             return;
         }
 
@@ -297,7 +297,6 @@ class hourControl extends BaseCronControl
      */
     public function expiredBonusOp()
     {
-
         notify_helper::bonus_expired();
     }
 }

helper/bonus/type.php

@@ -142,6 +142,9 @@ class type
     public function sender_id() {
         return $this->mParam['sender_id'];
     }
+    public function relayer_id() {
+        return $this->mParam['relayer_id'];
+    }
     public function isStart() {
         $start_time = intval($this->mParam['send_start_date']);
         if($start_time === 0) {

helper/notify_helper.php

@@ -64,7 +64,7 @@ class notify_helper
 
             $param = array();
             $param['member_id'] = $user_id;
-            $param['text'] = "红包过期通知:很遗憾,您价值{$amount}元的红包已经过期了,您干哈不早点分享给您的朋友呢:(";
+            $param['text'] = "红包过期通知:很遗憾,您价值{$amount}元的红包已经过期了,您早点分享给朋友,也是个人情:(";
             $param['go_type'] = 'bonus';
             QueueClient::push('upushSendMsg', $param);
 

mobile/control/bonusex.php

@@ -40,6 +40,12 @@ class bonusexControl extends mobileControl
         }
     }
 
+
+    private function isMineType(bonus\type $type)
+    {
+        return ($type->sender_id() == $_SESSION['member_id'] || $type->relayer_id() == $_SESSION['member_id']);
+    }
+
     public function openOp()
     {
         if(!isset($_GET['type_sn']) || empty($_GET['type_sn'])) {
@@ -54,6 +60,7 @@ class bonusexControl extends mobileControl
         $this->fileter_typeinfos($type_infos,$type_info,$binded_info);
         $type = \bonus\type::crate_by_paramer($type_infos['type_info']);
 
+        $isMineType = $this->isMineType($type);
         if($type->isStart() == false) {
             return self::outsuccess(array('type_info' => $type_info),"bonus/unstart");
         }
@@ -72,7 +79,7 @@ class bonusexControl extends mobileControl
                 }
             }
             $data = array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info);
-            if($bonus->isBinded()) {
+            if($bonus->isBinded() || $isMineType) {
                 return self::outsuccess($data,"bonus/content");
             }
             else
@@ -86,13 +93,25 @@ class bonusexControl extends mobileControl
         }
         else
         {   //我没有抢过的情况
-            if($type->isEnd()) {
-                return self::outsuccess(array('type_info' => $type_info),"bonus/end");
+            if($isMineType == false)
+            {
+                if($type->isEnd()) {
+                    return self::outsuccess(array('type_info' => $type_info),"bonus/end");
+                }
+                else if($type->binded_over()) {
+                    return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包派完了"),"bonus/over");
+                } else {
+                    return self::outsuccess(array('type_info' => $type_info),"bonus/open");
+                }
             }
-            else if($type->binded_over()) {
-                return self::outsuccess(array('type_info' => $type_info,'msg' => "手慢了，红包派完了"),"bonus/over");
-            } else {
-                return self::outsuccess(array('type_info' => $type_info),"bonus/open");
+            else
+            {
+                if($type->isEnd() || $type->binded_over()) {
+                    return self::outsuccess(array('type_info' => $type_info,'binded_info' => $binded_info),'bonus/detail');
+                }
+                else {
+                    return self::outsuccess(array('type_info' => $type_info),"bonus/open");
+                }
             }
         }
     }