Merge branch 'sess_0306' of 121.43.114.153:/home/git/repositories/shopnc into sess_0306

data/logic/queue.logic.php

@@ -11,6 +11,8 @@
 defined('InShopNC') or exit('Access Invalid!');
 
 require_once(BASE_ROOT_PATH . '/helper/push_app.php');
+require_once(BASE_ROOT_PATH . '/helper/sms_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/kdn_helper.php');
 
 class queueLogic
 {
@@ -20,9 +22,9 @@ class queueLogic
      * @var array
      */
     protected $go_type = array(
-                               '',//跳转到app首页
-                               'bonus',//红包页
-                              );
+        '',//跳转到app首页
+        'bonus',//红包页
+    );
 
     /**
      * 添加会员积分
@@ -393,38 +395,84 @@ class queueLogic
      */
     public function upushSendMsg($param)
     {
-        if(empty($param) || empty($param['member_id']) || empty($param['text'])){
-            Log::record("push info: 数据有误！ param:".json_encode($param)."\t session:".json_encode($_SESSION));
+        if (empty($param) || empty($param['member_id']) || empty($param['text'])) {
+            Log::record("push info: 数据有误！ param:" . json_encode($param) . "\t session:" . json_encode($_SESSION));
             return false;
         }
 
-        if(!isset($param['go_type'])){
+        if (!isset($param['go_type'])) {
             $param['go_type'] = '';
         }
 
-        if(!in_array($param['go_type'],$this->go_type)){
-            Log::record("push info: go_type参数有误！ param:".json_encode($param)."\t session:".json_encode($_SESSION));
+        if (!in_array($param['go_type'], $this->go_type)) {
+            Log::record("push info: go_type参数有误！ param:" . json_encode($param) . "\t session:" . json_encode($_SESSION));
             return false;
         }
 
         $push = new push_app();
 
-        try{
+        try {
             //androd
             $return = $push->sendAndroidCustomizedcast($param);
-            Log::record("push info: androd\treturn:".json_encode($return)."\t param:".json_encode($param));
+            Log::record("push info: androd\treturn:" . json_encode($return) . "\t param:" . json_encode($param));
         } catch (Exception $e) {
-            Log::record("push info: androd fall error\treturn:".$e->getMessage()."\t param:".json_encode($param));
+            Log::record("push info: androd fall error\treturn:" . $e->getMessage() . "\t param:" . json_encode($param));
         }
 
-        try{
+        try {
             //ios
             $return = $push->sendIOSCustomizedcast($param);
-            Log::record("push info: ios\treturn:".json_encode($return)."\t param:".json_encode($param));
+            Log::record("push info: ios\treturn:" . json_encode($return) . "\t param:" . json_encode($param));
         } catch (Exception $e) {
-            Log::record("push info: ios fall error\treturn:".$e->getMessage()."\t param:".json_encode($param));
+            Log::record("push info: ios fall error\treturn:" . $e->getMessage() . "\t param:" . json_encode($param));
         }
 
         return true;
     }
+
+    /**
+     * 发短信
+     * @param $param
+     *
+     * @return bool
+     */
+    public function sendSMS($param)
+    {
+        if (empty($param) || empty($param['mobile']) || empty($param['type'])) {
+            Log::record("sms info: 数据有误！ param:" . json_encode($param));
+            return false;
+        }
+
+        try {
+            $return = sms_helper::send($param['mobile'], $param['type']);
+            Log::record("sms info: return:" . json_encode($return) . "\t param:" . json_encode($param));
+        } catch (Exception $e) {
+            Log::record("sms info: fall error\treturn:" . $e->getMessage() . "\t param:" . json_encode($param));
+        }
+
+        return true;
+    }
+
+    /**
+     * 订阅快递鸟
+     * @param $param
+     *
+     * @return bool
+     */
+    public function dispatchKDN($param)
+    {
+        if (empty($param) || empty($param['order_sn'])) {
+            Log::record("kdn_helper: 数据有误！ param:" . json_encode($param));
+            return false;
+        }
+
+        try {
+            kdn_helper::subscribe($param['order_sn']);
+        } catch (Exception $e) {
+            Log::record("kdn_helper: fall error\treturn:" . $e->getMessage() . "\t param:" . json_encode($param));
+        }
+
+        return true;
+    }
+
 }

mobile/control/login.php

@@ -127,10 +127,12 @@ class loginControl extends mobileHomeControl
         }
 
         $member_info = $model_member->getMemberInfo($conditions,self::$fields);
-        field_helper::validate_null_string($member_info,'member_mobile,member_wxopenid,member_name,member_nickname,' .
+        field_helper::validate_null_string($member_info,'member_mobile,member_wxopenid,member_name,' .
             'member_truename,member_signname,member_avatar,member_email,member_birthday');
         field_helper::validate_null_string($member_info,'member_sex','0');
 
+        field_helper::validate_null_string($member_info,'member_nickname',substr_replace($openid, '****', 3, 4));
+
         return $member_info;
     }
 
@@ -159,13 +161,14 @@ class loginControl extends mobileHomeControl
             return self::outerr(errcode::ErrParamter, $err);
         }
 
-        $sms = new sms_helper();
-        $ret = $sms->send($mobile,$type);
-        if($ret['code'] == 200) {
+       // $sms = new sms_helper();
+      //  $ret = $sms->send($mobile,$type);
+        QueueClient::push('sendSMS',array('mobile'=>$mobile,'type'=>$type));
+        //if($ret['code'] == 200) {
             return self::outsuccess(NULL);
-        } else {
-            return self::outerr($ret['code'],$ret['msg']);
-        }
+        //} else {
+       //     return self::outerr($ret['code'],$ret['msg']);
+       // }
     }
 
     public function registerOp()
@@ -203,6 +206,7 @@ class loginControl extends mobileHomeControl
                 'member_passwd' => $password,
                 'member_sex' => 0,
                 'member_name' => $mobile,
+                'member_nickname' => substr_replace($mobile, '****', 3, 4),
                 'member_mobile_bind' => 1);
 
             $success = $model->addMember($member_info);
@@ -255,7 +259,8 @@ class loginControl extends mobileHomeControl
     public function bindOp()
     {
         $wx_openid = trim($_GET['wx_openid']);
-        $wx_info = trim($_GET['user_info']);
+        $nick_name = trim(urldecode($_GET['nick_name']));//微信昵称
+        $icon_url = trim(urldecode($_GET['icon_url']));//微信头像
         $mobile = trim($_GET['mobile']);
         $code = trim($_GET['code']);
 
@@ -285,7 +290,19 @@ class loginControl extends mobileHomeControl
             $member_id = $ret['member_id'];
         }
 
-        $ret = $model->editMember(array('member_id' => $member_id), array('member_wxopenid' => $wx_openid, 'wx_info' => $wx_info));
+        $wx_info = array(
+            'nick_name' =>$nick_name,
+            'icon_url'  =>$icon_url,
+        );
+
+        $update_arr['member_wxopenid'] = $wx_openid;
+        $update_arr['wx_info']         = json_encode($wx_info);
+
+        if (!empty($nick_name)){
+            $update_arr['member_nickname'] = $nick_name;
+        }
+
+        $ret = $model->editMember(array('member_id' => $member_id), $update_arr);
         if (!$ret) {
             return self::outerr(errcode::ErrDB);
         } else {

mobile/dispatch_notify.php

@@ -9,8 +9,7 @@
 require_once(BASE_ROOT_PATH . '/helper/kdn_helper.php');
 
 fcgi_header("Content-Type: text/plain; charset=UTF-8");
-try
-{
+try {
     //tid-订单号，status-1，consign_time-发货时间，logistics_no-快递流水，logistics_company-快递公司
 
     $order_sn = trim($_POST['tid']);
@@ -20,10 +19,10 @@ try
     $logistics_no = trim($_POST['logistics_no']);
     $logistics_company = trim(urldecode($_POST['logistics_company']));
 
-    Log::record("dispatch notify value: order_sn = {$order_sn},status={$status},consign_time = {$consign_time} logistics_no = {$logistics_no} logistics_company = {$logistics_company}.",Log::DEBUG);
+    Log::record("dispatch notify value: order_sn = {$order_sn},status={$status},consign_time = {$consign_time} logistics_no = {$logistics_no} logistics_company = {$logistics_company}.", Log::DEBUG);
 
     $express = Model('express')->field('id')->where(array('e_name' => $logistics_company))->select();
-    if(empty($express) || count($express) == 0) {
+    if (empty($express) || count($express) == 0) {
         echo 'FAIL';
         return;
     }
@@ -31,31 +30,26 @@ try
     $shipping_express_id = $express[0]['id'];
     $remote_addr = $_SERVER['REMOTE_ADDR'];
 
-    if(!empty($order_sn) && !empty($logistics_no))
-    {
-        if($status == 1)
-        {
+    if (!empty($order_sn) && !empty($logistics_no)) {
+        if ($status == 1) {
             $order = Model('order');
-            $ret = $order->setOrderDelivery($order_sn,$shipping_express_id,$logistics_no,$ship_time);
-            if($ret) {
-                kdn_helper::subscribe($order_sn);
+            $ret = $order->setOrderDelivery($order_sn, $shipping_express_id, $logistics_no, $ship_time);
+            if ($ret) {
+                //kdn_helper::subscribe($order_sn);
+                QueueClient::push('dispatchKDN',array('order_sn'=>$order_sn));
                 echo 'SUCCESS';
             } else {
                 echo 'AGAIN';
             }
-        }
-        else{
-            kdn_helper::subscribe($order_sn);
+        } else {
+           // kdn_helper::subscribe($order_sn);
+            QueueClient::push('dispatchKDN',array('order_sn'=>$order_sn));
             echo 'SUCCESS';
         }
-    }
-    else
-    {
+    } else {
         echo 'FAIL';
     }
-}
-catch (Exception $e)
-{
-    Log::record($e->errorMessage(),Log::ERR);
+} catch (Exception $e) {
+    Log::record($e->getMessage(), Log::ERR);
     echo 'AGAIN';
 }

request_helper.php

@@ -256,7 +256,7 @@ class request_helper
      */
     static public function url_jump(){
         Log::record("server:" . json_encode($_SERVER));
-        if ($_SERVER['HTTP_CLIENT_TYPE'] == 'Android' && $_SERVER['HTTP_CLIENT_VERSION'] == 3) {
+        if ($_SERVER['HTTP_CLIENT_TYPE'] == 'Android' && $_SERVER['HTTP_CLIENT_VERSION'] == '3') {
              http_header::instance()->header('location:http://a.lrlz.com:8000'.request_helper::req_uri(),false,302);
         }
    }