|
|
@@ -14,7 +14,6 @@ defined('InShopNC') or exit('Access Invalid!');
|
|
|
|
|
|
class member_orderControl extends mbMemberControl
|
|
|
{
|
|
|
-
|
|
|
public function __construct()
|
|
|
{
|
|
|
parent::__construct();
|
|
|
@@ -213,9 +212,7 @@ class member_orderControl extends mbMemberControl
|
|
|
if ($order_id <= 0) {
|
|
|
return joutput_error(errcode::ErrOrder, '订单不存在');
|
|
|
}
|
|
|
- /*
|
|
|
- * TODO:后台有合适的订单后，开启此注释进行调试
|
|
|
- *
|
|
|
+
|
|
|
$model_order = Model('order');
|
|
|
$condition['order_id'] = $order_id;
|
|
|
$condition['buyer_id'] = $this->member_info['member_id'];
|
|
|
@@ -226,25 +223,21 @@ class member_orderControl extends mbMemberControl
|
|
|
}
|
|
|
|
|
|
$express = rkcache('express', true);
|
|
|
- $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_code'];
|
|
|
+ $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_kdn_code'];
|
|
|
$e_name = $express[$order_info['extend_order_common']['shipping_express_id']]['e_name'];
|
|
|
|
|
|
$key = "express_" . $order_info['shipping_code'];
|
|
|
$deliver_info = rkcache($key);
|
|
|
if(empty($deliver_info))
|
|
|
{
|
|
|
+ //$deliver_info = $this->getOrderTracesByJson('STO', '3304699247030');
|
|
|
$deliver_info = $this->_get_express($e_code, $order_info['shipping_code']);
|
|
|
if ($deliver_info === false) {
|
|
|
return;
|
|
|
}
|
|
|
wkcache($key,$deliver_info,3600);
|
|
|
}
|
|
|
- */
|
|
|
|
|
|
- /*
|
|
|
- * TODO: 需要将shopnc后台的物流公司简称与快递鸟中物流公司的简称进行一一映射
|
|
|
- */
|
|
|
- $deliver_info = $this->getOrderTracesByJson('STO', '3304699247030');
|
|
|
$deliver_info = json_decode($deliver_info, true);
|
|
|
$routes = $deliver_info['Traces'];
|
|
|
krsort($routes);
|
stanley-king