add to local

admin/control/oper_sms.php

@@ -126,32 +126,4 @@ class oper_smsControl extends SystemControl
             showMessage("成功放入推送队列", 'ndex.php?act=oper_sms&op=awaken_user');
         }
     }
-
-    public function brand_awakenOp()
-    {
-        $amount = intval($_POST['amount']);
-        $brand = trim($_POST['brand']);
-        $openurl = trim($_POST['openurl']);
-
-        $days = intval($_POST['days']);
-        $et_amount = intval($_POST['et_amount']);
-
-        if(empty($amount) ||empty($brand) || empty($openurl) || empty($et_amount)) {
-            showMessage("参数错误，paysn 不能为空",'index.php?act=oper_sms&op=awaken_user','','error');
-        }
-        else
-        {
-            $send_params =['type' => Sms::tpl_new_goods,
-                'sms_params'  => ['day' => '周一','amount' => $amount,'brand' => $brand,'url' => $openurl],
-                'push_params' => []];
-
-            $filters = ['member_filters' => [ ['type' => 'bonus','amount' => $et_amount]],
-                'sms_filters' => [['type' => 'regtime','days' => $days]]];
-
-            $oper_param = ['type' => 'bonus','rate' => 30,'amount' => 50];
-
-            QueueClient::push('onAsyncBroadcastNormal',['filters' => $filters,'oper_param' => $oper_param,'send_params' => $send_params]);
-            showMessage("成功放入推送队列", 'ndex.php?act=oper_sms&op=awaken_user');
-        }
-    }
 }

admin/templates/default/oper_send.awaken.php

@@ -45,29 +45,6 @@
             </tbody>
         </table>
     </form>
-    <table class="table tb-type2 nobdb">
-        <tbody>
-        <tr>
-            <td class="w400 align-left"><label>短信内容，【熊猫美妆】周末福利大放送，{50}元红包已到账！{雪花秀、兰芝补货，SNP、婵真}上新，传送门：{http://t.cn/RY9Iiba}，退订回复N:</label></td>
-        </tr>
-        </tbody>
-    </table>
-    <form id="newbrand_form" class="form" method="post" action="index.php?act=oper_sms&op=brand_awaken" name="form1">
-        <input type="hidden" name="form_submit" value="ok"/>
-        <table class="table tb-type2 nobdb">
-            <tbody>
-            <tr>
-                <td class="w100 align-left">品牌上新:</td>
-                <td class="w200 align-left"><label>金额：<input type="text" name="amount" placeholder="单个用户红包金额"></label></td>
-                <td class="w250 align-left"><label>品牌：<input class="w200" type="text" name="brand" placeholder="请输入品牌语"></label></td>
-                <td class="w200 align-left"><label>网页地址：<input type="text" name="openurl" placeholder="请输入可打开地址"></label></td>
-                <td class="w250 align-left"><label>最近多少天注册用户：<input type="text" name="days" placeholder="请输入天数"></label></td>
-                <td class="w250 align-left"><label>红包少于多少元用户：<input type="text" name="et_amount" placeholder="请输入金额"></label></td>
-                <td class="w200 align-left"><a href="JavaScript:void(0);" class="submit_btn btn" id="submit_form"><span><?php echo $lang['nc_submit']; ?></span></a></td>
-            </tr>
-            </tbody>
-        </table>
-    </form>
 </div>
 <script type="text/javascript">
     $('.submit_btn').on('click', function () {

core/framework/libraries/sms.php

@@ -27,7 +27,6 @@ class Sms
     const tpl_order_complete_inviter = '219560';//亲爱的会员，您的{1}度粉丝{2}下单成功，您获得{3}元全抵红包。登陆APP可查看红包余额！退订回复N
     const tpl_order_complete_invitee = '219553';//亲爱的会员，您的好友{1}成为{2}的{3}度粉丝，您获得{4}元雨露均沾红包。退订回复N    
     const tpl_call_user_back = '219183';        //Hey，我是{1}，我正在赚红包，你也有得赚，赶快登陆App查看你的红包余额，赢免费大牌美妆~退订回复N
-    const tpl_new_goods = '221574';             //【模板ID：221574【熊猫美妆】{1}福利大放送，{2}元红包已到账！{3}上新，传送门：{4}，退订回复N
 
     /*
      * 发送手机短信

data/logic/queue.logic.php

@@ -742,18 +742,6 @@ class queueLogic
         return callback(true);
     }
 
-    public function onAsyncBroadcastNormal($param)
-    {
-        $filters = $param['filters'];
-        $oper_param = $param['oper_param'];
-        $send_params = $param['send_params'];
-
-        if(!empty($oper_param) && !empty($filters) && !empty($send_params)) {
-            account_helper::onAsyncBroadcastNormal($filters,$oper_param,$send_params);
-        }
-        return callback(true);
-    }
-
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function onAsyncUgcPublish($param)
     {

helper/account_helper.php

@@ -25,12 +25,7 @@ require_once(BASE_ROOT_PATH . '/helper/async/status.php');
 require_once(BASE_ROOT_PATH . '/helper/async/register.php');
 require_once(BASE_ROOT_PATH . '/helper/async/order.php');
 require_once(BASE_ROOT_PATH . '/helper/async/qugc.php');
-require_once(BASE_ROOT_PATH . '/helper/async/broadcast_order.php');
 require_once(BASE_ROOT_PATH . '/helper/async/broadcast.php');
-require_once(BASE_ROOT_PATH . '/helper/async/broadcast/filter.php');
-require_once(BASE_ROOT_PATH . '/helper/async/broadcast/operator.php');
-require_once(BASE_ROOT_PATH . '/helper/async/broadcast/sender.php');
-require_once(BASE_ROOT_PATH . '/helper/async/broadcast/params_table.php');
 
 require_once(BASE_ROOT_PATH . '/helper/order_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/fcode/present_manager.php');
@@ -448,32 +443,12 @@ class account_helper
     {
         try
         {
-            $iPusher = new async\broadcast_order($pay_sn);
+            $iPusher = new async\broadcast($pay_sn);
             $iPusher->order_bonus($amount,$days);
         } catch (Exception $ex) {
             Log::record($ex->getMessage(),Log::ERR);
         }
     }
-    public static function onAsyncBroadcastNormal($filters,$oper_param,$send_params)
-    {
-        try
-        {
-            $sms_type = $send_params['type'];
-
-            $memf_params = $filters['member_filters'];
-            $mem_filters = async\filter::create($memf_params);
-            $oper = async\operator::create($oper_param);
-
-            $smsf_params = $filters['sms_filters'];
-            $sms_filters = async\filter::create($smsf_params);
-
-            $sender = async\sender::create($sms_filters,$send_params);
-            $broad = new async\broadcast($mem_filters,$oper,$sender,$sms_type);
-            $broad->run();
-        } catch (Exception $ex) {
-            Log::record($ex->getMessage(),Log::ERR);
-        }
-    }
 
     public static function onAsyncOrderCancel($pay_sn)
     {

helper/async/broadcast.php

@@ -2,13 +2,12 @@
 /**
  * Created by PhpStorm.
  * User: stanley-king
- * Date: 2017/12/2
- * Time: 下午7:27
+ * Date: 2017/11/15
+ * Time: 下午4:20
  */
 
 namespace async;
 
-
 use push_helper;
 use order_helper;
 use member_info;
@@ -18,59 +17,94 @@ use bonus_helper;
 use Log;
 use util;
 
-class broadcast
+class broadcast extends IAsync
 {
-    private $mFilters;
-    private $mOperator;
-    private $mSender;
-    private $mSmstype;
+    private $simple_order;
+    private $user_info;
+    private $paysn;
 
-    public function __construct($filters, operator $operator, sender $sender,$sms_type)
+    public function __construct($paysn)
     {
-        $this->mFilters = $filters;
-        $this->mOperator = $operator;
-        $this->mSender = $sender;
-        $this->mSmstype = $sms_type;
-    }
+        $this->paysn = $paysn;
+        $order = $this->order(['pay_sn' => $paysn]);
+        if(empty($order)) throw new Exception("错误的订单");
 
+        $this->simple_order = new simple_order($order);
+        $user = $this->simple_order->user();
+        $this->user_info = new member_info($user);
+    }
     public function run()
     {
-        $params = params_table::instance()->find_params($this->mSmstype);
+    }
+
+    public function order_bonus($amount,$days = 30)
+    {
         $mod_member = Model('member');
+        $days = intval($days);
+        $cond['member_time'] = ['gt',util::first_day_secs(time() - $days * 86400)];
         $i = 0;
         while (true)
         {
             $start = $i * 1000;
-            $items = $mod_member->field('*')->order('member_id asc')->limit("{$start},1000")->select();
+            $items = $mod_member->field('member_id')->where($cond)->order('member_id asc')->limit("{$start},1000")->select();
             if(empty($items)) {
                 return;
             }
             $i++;
 
-            $match_users = [];
+            $uids = [];
             foreach ($items as $item)
             {
-                $minfo = new member_info($item);
-                if($this->filtrate($minfo)) {
-                    $match_users[] = $minfo;
-                }
+                $user = intval($item['member_id']);
+                if($user <= 0) continue;
+                $uids[] = $user;
             }
-            $ret = $this->mOperator->operate($match_users,$params);
-            if($ret != false) {
-                $this->mSender->run($match_users,$ret);
+
+            $num = count($uids);
+
+            $params = bonus\parameters::order_complete_all($this->user_info->nickname(),$num,$amount);
+            foreach ($params as $param)
+            {
+                $type = bonus_helper::create_type_input($param);
+                $rate  = $type->bonus_rate();
+                $ret = bonus_helper::make_bonus($param,$param['rate_money']);
+
+                if($ret != false)
+                {
+                    $type_sn = $ret['type_sn'];
+                    bonus_helper::send($type_sn,$uids);
+                    foreach ($uids as $user)
+                    {
+                        try
+                        {
+                            push_helper::all_order_complete_bonus($user,$this->user_info,$amount,$rate,$type_sn);
+                            $this->add_reward($user,$amount);
+                            usleep(100000);
+                        }
+                        catch (Exception $ex) {
+                            Log::record(__METHOD__ . " error " . $ex->getTraceAsString(),Log::ERR);
+                        }
+                    }
+                }
+                else {
+                    return false;
+                }
             }
         }
+
+        return true;
     }
 
-    private function filtrate(member_info $minfo)
+    private function order($condition)
     {
-        foreach ($this->mFilters as $filter)
-        {
-            if($filter->filtrate($minfo) == false) {
-                return false;
-            }
+        $model_order = Model('order');
+        $order_list = $model_order->getNormalOrderList($condition,0, '*', 'order_id desc', '', ['order_common','order_address', 'order_goods']);
+        $order_helper = new order_helper($order_list);
+        $orders = $order_helper->format();
+        if(!empty($orders)) {
+            return $orders[0];
+        } else {
+            return false;
         }
-
-        return true;
     }
 }

helper/async/broadcast/filter.php

@@ -1,133 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 2017/12/2
- * Time: 下午7:51
- */
-
-namespace async;
-
-use member_info;
-use predeposit_helper;
-
-abstract class filter
-{
-    public function __construct()
-    {
-    }
-
-    public abstract function filtrate(member_info $minfo);
-    public static function create($params)
-    {
-        $result = [];
-        foreach ($params as $param)
-        {
-            $type = $param['type'];
-
-            if($type == 'bonus') {
-                $filter = new bonus_filter($param);
-            }
-            elseif($type == 'regtime') {
-                $filter = new regtime_filter($param);
-            }
-            elseif($type == 'mobile') {
-                $filter = new mobile_filter();
-            }
-            else {
-                return null;
-            }
-            $result[] = $filter;
-        }
-
-        return $result;
-    }
-
-    protected function usable_bonus($member_id)
-    {
-        $pred = new predeposit_helper($member_id);
-        return $pred->total_bonus();
-    }
-}
-
-class regtime_filter extends filter
-{
-    private $mIncludeTime;
-    public function __construct($param)
-    {
-        $days = intval($param['days']);
-        if($days < 0) {
-            $this->mIncludeTime = 0;
-        } else {
-            $this->mIncludeTime = time() - $days * 86400;
-        }
-        parent::__construct();
-    }
-
-    public function filtrate(member_info $minfo)
-    {
-        return $minfo->reg_time() > $this->mIncludeTime;
-    }
-}
-
-class bonus_filter extends filter
-{
-    private $mMaxAmount;
-
-    public function __construct($param)
-    {
-        $this->mMaxAmount = intval($param['amount']);
-        parent::__construct();
-    }
-
-    public function filtrate(member_info $minfo)
-    {
-        $member_id = $minfo->member_id();
-        $bonus_amount = $this->usable_bonus($member_id);
-        return $bonus_amount < $this->mMaxAmount;
-    }
-}
-
-class app_filter extends filter
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function filtrate(member_info $minfo)
-    {
-        return $minfo->is_app();
-    }
-}
-
-class notapp_filter extends filter
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function filtrate(member_info $minfo)
-    {
-        return !$minfo->is_app();
-    }
-}
-
-class mobile_filter extends filter
-{
-    private $mIncludes;
-    public function __construct()
-    {
-        $this->mIncludes = [];
-        $this->mIncludes[] = '13911129867';
-        parent::__construct();
-    }
-
-    public function filtrate(member_info $minfo)
-    {
-        $mobile = $minfo->mobile();
-        return in_array($mobile,$this->mIncludes);
-    }
-}
-

helper/async/broadcast/operator.php

@@ -1,84 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 2017/12/2
- * Time: 下午7:53
- */
-
-namespace async;
-
-use bonus\parameters;
-use bonus_helper;
-
-abstract class operator
-{
-    public function __construct()
-    {
-    }
-
-    abstract public function operate(array $minfos,$params);
-    public static function create($params)
-    {
-        $type = $params['type'];
-        if($type == 'bonus') {
-            return new bonus_operator($params);
-        }
-        else {
-            return null;
-        }
-    }
-}
-
-class bonus_operator extends operator
-{
-    private $mRate;
-    private $mAmount;
-
-    public function __construct($params) {
-        $this->mRate = intval($params['rate']);
-        $this->mAmount = floatval($params['amount']);
-    }
-
-    public function operate(array $minfos,$params)
-    {
-        $uids = [];
-        foreach ($minfos as $minfo)
-        {
-            $uid = $minfo->member_id();
-            if($uid > 0) {
-                $uids[] = $uid;
-            }
-        }
-        if(!empty($uids)) {
-            return $this->make_bonus($uids,$params);
-        } else {
-            return false;
-        }
-    }
-
-    private function make_bonus($uids,$params)
-    {
-        $bless = $params['type_bless'];
-        $name = $params['type_name'];
-
-        $params = parameters::awken_user($this->mRate,$this->mAmount,count($uids),$name,$bless);
-        foreach ($params as $param)
-        {
-            $ret = bonus_helper::make_bonus($param,$param['rate_money']);
-
-            if($ret != false)
-            {
-                $type_sn = $ret['type_sn'];
-                bonus_helper::send($type_sn,$uids);
-            }
-            else {
-                return false;
-            }
-        }
-
-        return ['type_sn' => $type_sn];
-    }
-}
-
-

helper/async/broadcast/params_table.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 2017/12/4
- * Time: 上午11:06
- */
-
-namespace async;
-
-use Sms;
-class params_table
-{
-    private $mSmstypeParams;
-    private static $stInstance;
-
-    private function __construct()
-    {
-        $this->mSmstypeParams = [];
-        $this->mSmstypeParams[Sms::tpl_new_goods] = [
-            'type_bless' => '韩国品牌婵真上架，领红包，愉快购物～',
-            'type_name'  => '购物红包～',
-            'push_title' => "收到上新红包",
-            'push_text'  => "韩国大牌 婵真 最新入驻，领50元红包，马上尝鲜～",
-            'push_url' => ""
-        ];
-    }
-
-    static public function instance()
-    {
-        if(self::$stInstance == null) {
-            self::$stInstance = new params_table();
-        }
-        return self::$stInstance;
-    }
-    public function find_params($sms_type)
-    {
-        if(array_key_exists($sms_type,$this->mSmstypeParams)) {
-            return $this->mSmstypeParams[$sms_type];
-        } else {
-            return [];
-        }
-    }
-}

helper/async/broadcast/sender.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 2017/12/3
- * Time: 下午3:38
- */
-
-namespace async;
-use member_info;
-use Sms;
-use push_helper;
-use schema_helper;
-use push_sender;
-use Log;
-
-class sender
-{
-    private $mSmsFilters;
-    private $mSmsParams;
-    private $mSmsType;
-    private $mSmsObject;
-
-
-    public function __construct($sms_filters,$sends_params)
-    {
-        $this->mSmsFilters = $sms_filters;
-        $this->mSmsFilters[] = new notapp_filter();
-
-        $this->mSmsParams = $sends_params['sms_params'];
-        $this->mSmsType = $sends_params['type'];
-        $this->mSmsObject = new Sms();
-    }
-
-    public function run($minfos,$oper_result)
-    {
-        $params = params_table::instance()->find_params($this->mSmsType);
-        foreach ($minfos as $minfo)
-        {
-            if($this->filtrate($minfo)) {
-                Log::record("send_sms",Log::DEBUG);
-                $this->send_sms($minfo);
-            }
-            else {
-                Log::record("send_push",Log::DEBUG);
-                $this->send_push($minfo,$params,$oper_result);
-            }
-        }
-    }
-
-    private function send_sms(member_info $minfo)
-    {
-        $mobile = $minfo->mobile();
-        $status = $this->mSmsObject->send_oper($mobile,$this->mSmsType,$this->mSmsParams);
-        return ($status == 0);
-    }
-
-    private function schema_url($oper_result)
-    {
-        if(empty($oper_result)) return '';
-        if(array_key_exists('type_sn',$oper_result)) {
-            $type_sn = $oper_result['type_sn'];
-            return schema_helper::bonus_detail($type_sn);
-        }
-        else {
-            return '';
-        }
-    }
-
-    private function send_push($minfo,$params,$oper_result)
-    {
-        $title = $params['push_title'];
-        $text  = $params['push_text'];
-        $url = $this->schema_url($oper_result);
-
-        $user = $minfo->member_id();
-        $push_param = push_helper::pop_message($user,$title,$text,$url);
-        $push = new push_sender();
-        $status = $push->send($push_param);
-    }
-
-    private function filtrate(member_info $minfo)
-    {
-        foreach ($this->mSmsFilters as $filter)
-        {
-            if($filter->filtrate($minfo) == false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public static function create($sms_filters,$sms_params)
-    {
-        return new sender($sms_filters,$sms_params);
-    }
-}

helper/async/broadcast_order.php

@@ -1,110 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: stanley-king
- * Date: 2017/11/15
- * Time: 下午4:20
- */
-
-namespace async;
-
-use push_helper;
-use order_helper;
-use member_info;
-use Exception;
-use bonus;
-use bonus_helper;
-use Log;
-use util;
-
-class broadcast_order extends IAsync
-{
-    private $simple_order;
-    private $user_info;
-    private $paysn;
-
-    public function __construct($paysn)
-    {
-        $this->paysn = $paysn;
-        $order = $this->order(['pay_sn' => $paysn]);
-        if(empty($order)) throw new Exception("错误的订单");
-
-        $this->simple_order = new simple_order($order);
-        $user = $this->simple_order->user();
-        $this->user_info = new member_info($user);
-    }
-    public function run()
-    {
-    }
-
-    public function order_bonus($amount,$days = 30)
-    {
-        $mod_member = Model('member');
-        $days = intval($days);
-        $cond['member_time'] = ['gt',util::first_day_secs(time() - $days * 86400)];
-        $i = 0;
-        while (true)
-        {
-            $start = $i * 1000;
-            $items = $mod_member->field('member_id')->where($cond)->order('member_id asc')->limit("{$start},1000")->select();
-            if(empty($items)) {
-                return;
-            }
-            $i++;
-
-            $uids = [];
-            foreach ($items as $item)
-            {
-                $user = intval($item['member_id']);
-                if($user <= 0) continue;
-                $uids[] = $user;
-            }
-
-            $num = count($uids);
-
-            $params = bonus\parameters::order_complete_all($this->user_info->nickname(),$num,$amount);
-            foreach ($params as $param)
-            {
-                $type = bonus_helper::create_type_input($param);
-                $rate  = $type->bonus_rate();
-                $ret = bonus_helper::make_bonus($param,$param['rate_money']);
-
-                if($ret != false)
-                {
-                    $type_sn = $ret['type_sn'];
-                    bonus_helper::send($type_sn,$uids);
-                    foreach ($uids as $user)
-                    {
-                        try
-                        {
-                            push_helper::all_order_complete_bonus($user,$this->user_info,$amount,$rate,$type_sn);
-                            $this->add_reward($user,$amount);
-                            usleep(100000);
-                        }
-                        catch (Exception $ex) {
-                            Log::record(__METHOD__ . " error " . $ex->getTraceAsString(),Log::ERR);
-                        }
-                    }
-                }
-                else {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private function order($condition)
-    {
-        $model_order = Model('order');
-        $order_list = $model_order->getNormalOrderList($condition,0, '*', 'order_id desc', '', ['order_common','order_address', 'order_goods']);
-        $order_helper = new order_helper($order_list);
-        $orders = $order_helper->format();
-        if(!empty($orders)) {
-            return $orders[0];
-        } else {
-            return false;
-        }
-    }
-}

helper/bonus/parameters.php

@@ -312,32 +312,14 @@ class parameters
         $params = [];
 
         $param['make_type'] = type::MakeAllowanceType;
-        $param['type_name']  = "津贴红包";
+        $param['type_name'] = "津贴红包";
         $param['type_bless'] = "您的红包余额不足，好心人紧急为您充值～";
         $param['send_type']  = type::SendType_Fixed;
         $param['grab_type']  = type::GrabType_All;
         $param['sender_id']   = self::admin_member_id;
         $param['sender_name'] = self::admin_name;
         $param['usable_days'] = self::usable_days;
-        $param['rate_money'][] = ['amount' => 50, 'num' => 1, 'rate' => 20];
-        $params[] = $param;
-
-        return $params;
-    }
-    /////////////////////////////////////////////////////////////////////////////////////////////
-    public static function awken_user($rate,$amount,$num,$name,$bless)
-    {
-        $params = [];
-
-        $param['make_type'] = type::MakeAllowanceType;
-        $param['type_name']  = $name;
-        $param['type_bless'] = "$bless";
-        $param['send_type']  = type::SendType_Fixed;
-        $param['grab_type']  = type::GrabType_All;
-        $param['sender_id']   = self::admin_member_id;
-        $param['sender_name'] = self::admin_name;
-        $param['usable_days'] = self::usable_days;
-        $param['rate_money'][] = ['amount' => $amount, 'num' => $num, 'rate' => $rate];
+        $param['rate_money'][] = ['amount' => 50,   'num' => 1, 'rate' => 20];
         $params[] = $param;
 
         return $params;

helper/fcode/mfcode.php

@@ -73,6 +73,7 @@ class mfcode
         $result['key']      = $this->user_key();
         $result['usable_time'] = $this->usable_time();
         $result['state'] = $this->state();
+
         $result['used'] = $this->used();
         $result['expired'] = $this->expired();
 

helper/model/member_info.php

@@ -166,7 +166,4 @@ class member_info
     public function rewared_inviter() {
         return intval($this->member_info['rewared_inviter']) == 1;
     }
-    public function is_app() {
-        return intval($this->member_info['client_type']) > 0;
-    }
 }

helper/push_helper.php

@@ -304,7 +304,6 @@ class push_helper
         $text = "您的好友 {$user->nickname()},刚刚购买了《{$goods_name}》.";
         return $text;
     }
-
     public static function invitee_order_paied($invitee, $user, $goods_info)
     {
         $user_info = new member_info($user);
@@ -323,6 +322,7 @@ class push_helper
         $push_param['extra']['image']    = $goods_info['goods_image'];
 
         QueueClient::push('upushSendMsg',$push_param);
+        //self::push($invitee,$push_param);
     }
 
     public static function user_order_paied($user, $paysn)
@@ -884,21 +884,6 @@ class push_helper
         $push_param['extra']['url'] = schema_helper::invite_page();
         self::push($callee,$push_param,Sms::tpl_call_user_back,['name' => $minfo->nickname()],true);
     }
-    public static function pop_message($user, $title, $text,$url)
-    {
-        $push_param['alias'] = $user;
-        $push_param['title'] = $title;
-        $push_param['text']      = $text;
-
-        $push_param['extra']['go_type'] = '';
-        $push_param['extra']['title']= $title;
-        $push_param['extra']['text'] = $text;
-        $push_param['extra']['show_type'] = 'pop';
-        $push_param['extra']['image'] = self::admin_avatar();
-        $push_param['extra']['url'] = $url;
-
-        return $push_param;
-    }
 }
 
 class push_event

test/TestPush.php

@@ -70,23 +70,4 @@ class TestPush extends PHPUnit_Framework_TestCase
     {
         QueueClient::async_push('onAsyncRegister',['user' => self::test_ios_member_id,'inviter' => self::test_android_member_id],1);
     }
-    public function testBroadcast()
-    {
-        //"http://t.cn/RYTpzAr"
-        $send_params =['type' => Sms::tpl_new_goods,
-            'sms_params'  => ['day' => '周一','amount' => 50,'brand' => "婵真",'url' => "http://t.cn/RYTpzAr"],
-            'push_params' => []];
-
-        $filters = ['member_filters' => [ ['type' => 'bonus','amount' => 50000],['type' => 'mobile']],
-            'sms_filters' => [['type' => 'regtime','days' => 5]]];
-
-        $oper_param = ['type' => 'bonus','rate' => 30,'amount' => 50];
-
-        account_helper::onAsyncBroadcastNormal($filters,$oper_param,$send_params);
-    }
-
-    public function testStaticCall()
-    {
-        
-    }
 }