add to local

data/model/mobile_contacts.model.php

@@ -9,6 +9,11 @@ class mobile_contactsModel extends Model
         parent::__construct('mobile_contacts');
     }
 
+    public function add()
+    {
+
+    }
+
     public function generateFriendRelationship($member_id)
     {
         $ret = $this->field('member_id,origin_contacts,unregister_contacts,friend_contacts')->where(array("member_id"=>$member_id,"task_status"=>0))->find();

data/model/user_bonus.model.php

@@ -13,6 +13,8 @@ class user_bonusModel extends Model
     const send_bonus = 1;
     const grab_bonus = 2;
 
+    const TopupState = 3;
+
 
     public function __construct()
     {
@@ -192,15 +194,28 @@ class user_bonusModel extends Model
         }
     }
 
-    public function get_expired_soon_notify_bonus($warn_remain_days, $warn_interval_days)
+    public function getNeedWarn($left_days, $interval_days)
     {
-        $field = 'bonus_id,user_id,type_sn,(usable_time-unix_timestamp(now())) as seconds';
-        $condition = 'usable_time > unix_timestamp(now()) and  usable_time-unix_timestamp(now()) <= {$warn_remain_days} and (isnull(notify_time) or unix_timestamp(now()) - notify_time >= {$warn_interval_days})';
+        if(!isset($left_days) || !isset($interval_days)) {
+            return false;
+        }
+
+        $cur_time = time();
+        $field = "bonus_id,user_id,type_sn,(usable_time-{$cur_time}) as leftsecs";
+        $day_secs = 24 * 3600;
+        $left_warn_secs = intval($left_days) * $day_secs;
+        $period_secs = intval($interval_days) * $day_secs;
+
+        $condition = "bonus_status = 3 and usable_time > {$cur_time} and usable_time-{$cur_time} <= {$left_warn_secs} and (isnull(notify_time) or {$cur_time} - notify_time >= {$period_secs})";
         $ret = $this->field($field)->where($condition)->limit(false)->select();
-        return $ret;
+        if(empty($ret)) {
+            return false;
+        } else {
+            return $ret;
+        }
     }
 
-    public function get_already_expired_bonus()
+    public function getexpired_bonus()
     {
         $field = 'bonus_id,user_id,type_sn';
         $condition = 'usable_time <= unix_timestamp(now())';

helper/user_helper.php

@@ -131,7 +131,7 @@ class user_helper
     static public function notify_soon_expired_bonus($warn_remain_days, $warn_interval_days)
     {
         $user_bonus_model = Model("user_bonus");
-        $expired_list = $user_bonus_model->get_expired_soon_notify_bonus($warn_remain_days, $warn_interval_days);
+        $expired_list = $user_bonus_model->getNeedWarn($warn_remain_days, $warn_interval_days);
         $bonus_ids = array();
 
         foreach ($expired_list as $key => $val) {

mobile/control/member_info.php

@@ -110,6 +110,7 @@ class member_infoControl extends mbMemberControl
         }
 
         $ret = Model('mobile_contacts')->insert(array('member_id'=>$member_id,'origin_contacts'=>serialize($contacts),'task_status'=>0), true);
+        
         if ($ret == false) {
             return self::outerr(errcode::ErrDB);
         }