add express info

data/model/predeposit.model.php

@@ -121,7 +121,7 @@ class predepositModel extends Model {
      * @param string $order
      */
     public function getPdLogList($condition = array(), $pagesize = '', $fields = '*', $order = '', $limit = '') {
-        return $this->table('pd_log')->where($condition)->field($fields)->order($order)->limit($limit)->page($pagesize)->select();
+        return $this->table('xzsd')->where($condition)->field($fields)->order($order)->limit($limit)->page($pagesize)->select();
     }
 
     /**

mobile/control/delivery.php

@@ -14,16 +14,47 @@ class deliveryControl extends mobileHomeControl
         parent::__construct();
     }
 
+
+    /**
+     * @desc：物流信息查询
+     * @author：jiafang.wang
+     * @since: 2016.2.22
+     */
     public function queryOp()
     {
+        //获取物流单号
+        //$order_sn = $_GET['order_sn'];
+        //$condition = ['order_sn' => $order_sn];
+        //$postid = Model()->table('goods')->where($condition)->field('shipping_code')->find();
+        $postid = '227270508536';
 
 
-        // 查询本地是否有
+        //查询本地是否有
             //取参数
             //请求快递100
             //取得json
             //存数据库
+        //获取物流公司
+
+        $com = 'shentong';
+        //key
+        $key = '5b634ac27f4c1a82';
+        //组装URL查询
+        $url = "http://api.kuaidi100.com/api";//?id={$key}&com={$com}&nu={$postid}&show=0&muti=1&order=desc";
+        $params = array();
+        {
+            $params['id'] = $key;
+            $params['com'] = $com;
+            $params['nu'] = $postid;
+            $params['show'] = 0;
+            $params['muti'] = 1;
+            $params['order'] = 'desc';
+        }
+
+        $response = http_request($url, $params, 'GET');
+        $data = json_decode($response);
 
+        Tpl::output('info', $data);
         Tpl::showpage('express_info');
     }
 }

mobile/control/efficacy.php

@@ -25,7 +25,6 @@ class efficacyControl extends mobileHomeControl
 
         $result = array();
         foreach ($efficacy_list as $value) {
-
             $item['efficacy_id'] = $value['efficacy_id'];
             $item['efficacy_name']=$value['efficacy_name'];
 

mobile/control/member_order.php

@@ -196,13 +196,13 @@ class member_orderControl extends mobileMemberControl
         $order_id = intval($_POST['order_id']);
         if ($order_id <= 0) {
             return joutput_error(errcode::ErrOrder, '订单不存在');
-            return;
         }
 
         $model_order = Model('order');
         $condition['order_id'] = $order_id;
         $condition['buyer_id'] = $this->member_info['member_id'];
         $order_info = $model_order->getOrderInfo($condition, array('order_common', 'order_goods'));
+
         if (empty($order_info) || !in_array($order_info['order_state'], array(ORDER_STATE_SEND, ORDER_STATE_SUCCESS))) {
             return joutput_error(errcode::ErrOrder, '订单不存在');
         }
@@ -211,21 +211,28 @@ class member_orderControl extends mobileMemberControl
         $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_code'];
         $e_name = $express[$order_info['extend_order_common']['shipping_express_id']]['e_name'];
 
-        $deliver_info = $this->_get_express($e_code, $order_info['shipping_code']);
-        if ($deliver_info === false) {
-            return;
+        $key = "express_" . $order_info['shipping_code'];
+        $deliver_info = rkcache($key);
+        if(empty($deliver_info))
+        {
+            $deliver_info = $this->_get_express($e_code, $order_info['shipping_code']);
+            if ($deliver_info === false) {
+                return;
+            }
+            wkcache($key,$deliver_info,3600);
         }
+
         joutput_data(array('express_name' => $e_name, 'shipping_code' => $order_info['shipping_code'], 'deliver_info' => $deliver_info));
     }
 
+
     /**
      * 从第三方取快递信息
      *
      */
     public function _get_express($e_code, $shipping_code)
     {
-
-        $url = BASE_SITE_URL . 'http://www.kuaidi100.com/query?type=' . $e_code . '&postid=' . $shipping_code . '&id=1&valicode=&temp=' . random(4) . '&sessionid=&tmp=' . random(4);
+        $url = 'http://www.kuaidi100.com/query?type=' . $e_code . '&postid=' . $shipping_code . '&id=1&valicode=&temp=' . random(4) . '&sessionid=&tmp=' . random(4);
         import('function.ftp');
         $content = dfsockopen($url);
         $content = json_decode($content, true);

mobile/dispatch_notify.php

@@ -15,7 +15,15 @@ try
     $status = intval($_POST['status']);
     //$consign_time = $_POST['consign_time'];
     $logistics_no = trim($_POST['logistics_no']);
-    //$logistics_company = $_POST['logistics_company'];
+    $logistics_company = $_POST['logistics_company'];
+
+    $express = Model('express')->field('id')->where(array('e_code' => $logistics_company))->select();
+    if(empty($express) || count($express) == 0) {
+        echo 'FAIL';
+        return;
+    }
+
+    $shipping_express_id = $express[0]['id'];
 
     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);
 
@@ -25,7 +33,10 @@ try
     {
         if($status == 1)
         {
+            //,'shipping_time' => )
+            Model()->table('order_common')->where(array('order_sn' => $order_sn))->update(array('shipping_express_id' => $shipping_express_id));
             $ret = Model()->table('order')->where(array('order_sn' => $order_sn))->update(array('order_state' => ORDER_STATE_SEND,'shipping_code' => $logistics_no));
+
             if($ret) {
                 echo 'SUCCESS';
             } else {

mobile/templates/default/express_info.php

@@ -4,4 +4,7 @@
  * User: stanley-king
  * Date: 16/2/22
  * Time: 上午11:54
- */
+ */
+defined('InShopNC') or exit('Access Invalid!');
+
+var_dump( $out['info'] );