|
|
@@ -37,12 +37,15 @@ class Order extends BaseApi
|
|
|
$order_common_model = new OrderCommonModel();
|
|
|
$order_id = isset($this->params['order_id']) ? $this->params['order_id'] : 0;
|
|
|
$result = $order_common_model->getMemberOrderDetail($order_id, $this->member_id);
|
|
|
+ $delivery_info = model("express_delivery_package")->getInfo(['order_id'=>$order_id], 'express_company_name,delivery_no');
|
|
|
+
|
|
|
$goods_model = new \app\model\goods\Goods();
|
|
|
$result['data']['create_time']=date('Y-m-d H:i:s',$result['data']['create_time']);
|
|
|
$result['data']['pay_time']=date('Y-m-d H:i:s',$result['data']['pay_time']);
|
|
|
$result['data']['delivery_time']=date('Y-m-d H:i:s',$result['data']['delivery_time']);
|
|
|
$result['data']['finish_time']=date('Y-m-d H:i:s',$result['data']['finish_time']);
|
|
|
-
|
|
|
+ $result['data']['express_company_name']=$delivery_info['data']['express_company_name'];
|
|
|
+ $result['data']['delivery_no']=$delivery_info['data']['delivery_no'];
|
|
|
foreach ($result['data']['order_goods'] as &$vv) {
|
|
|
$sku_spec_format = $goods_model->getGoodsSkuInfo([['sku_id', '=', $vv['sku_id']]], 'sku_spec_format');
|
|
|
$vv['sku_spec_format'] = $sku_spec_format['data']['sku_spec_format'];
|
