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

fcgi_run.php

@@ -14,6 +14,7 @@ function pays_execute($file)
 
     $name = basename($file);
 
+
     return in_array($name,$exfiles);
 }
 

mobile/control/member_order.php

@@ -228,7 +228,6 @@ class member_orderControl extends mbMemberControl
             if($cur_type == $html_type) {
                 Tpl::output('query_status', false);
                 Tpl::showpage('express_info');
-                Log::record("search_deliverOp 1",Log::DEBUG);
                 return;
             } else {
                 return joutput_error($this->err_code);
@@ -241,7 +240,6 @@ class member_orderControl extends mbMemberControl
             if($cur_type == $html_type) {
                 Tpl::output('query_status', false);
                 Tpl::showpage('express_info');
-                Log::record("search_deliverOp 2",Log::DEBUG);
                 return;
             } else {
                 return joutput_error(errcode::ErrOrder, '订单不存在');
@@ -258,7 +256,6 @@ class member_orderControl extends mbMemberControl
             if($cur_type == $html_type) {
                 Tpl::output('query_status', false);
                 Tpl::showpage('express_info');
-                Log::record("search_deliverOp 3",Log::DEBUG);
                 return;
             } else {
                 return joutput_error(errcode::ErrOrder, '订单不存在');
@@ -274,11 +271,11 @@ class member_orderControl extends mbMemberControl
         if (empty($deliver_info))
         {
             $deliver_info = $this->getOrderTracesByJson($e_code, $order_info['shipping_code']);
-            if ($deliver_info === false)
+            if ($deliver_info === false || empty($deliver_info))
             {
+                Log::record("search_deliver:cannot query delivery info from kuaidn.",Log::ERR);
                 Tpl::output('query_status', false);
                 Tpl::showpage('express_info');
-                Log::record("search_deliverOp 4",Log::DEBUG);
                 return;
             }
             wkcache($key, $deliver_info, 3600);
@@ -289,9 +286,8 @@ class member_orderControl extends mbMemberControl
 
         $routes = $deliver_info['Traces'];
         krsort($routes);
-        switch ($deliver_info['State']) {
-            case '1':
-                break;
+        switch ($deliver_info['State'])
+        {
             case '2':
                 $msg = '在途中';
                 break;
@@ -301,10 +297,13 @@ class member_orderControl extends mbMemberControl
             case '4':
                 $msg = '问题件';
                 break;
+            default: {
+                Tpl::output('query_status', false);
+                Tpl::showpage('express_info');
+                return;
+            }
         }
 
-        Log::record("search_deliverOp 4",Log::DEBUG);
-
         Tpl::output('query_status', true);
         Tpl::output('msg_statu', $msg);
         Tpl::output('LogisticCode', $deliver_info['LogisticCode']);
@@ -402,16 +401,19 @@ class member_orderControl extends mbMemberControl
         $httpheader .= $post_data;
         $fd = fsockopen($url_info['host'], 80);
         fwrite($fd, $httpheader);
-        $gets = "";
+
         while (!feof($fd)) {
             if (($header = @fgets($fd)) && ($header == "\r\n" || $header == "\n")) {
                 break;
             }
         }
+
+        $gets = false;
         while (!feof($fd)) {
             $gets .= fread($fd, 128);
         }
         fclose($fd);
+
         return $gets;
     }