|
@@ -17,6 +17,8 @@
|
|
|
namespace app\api\controller;
|
|
|
|
|
|
use app\model\express\ExpressPackage;
|
|
|
+use app\model\member\Member;
|
|
|
+use app\model\member\MemberVip;
|
|
|
use app\model\order\Invoice;
|
|
|
use app\model\order\Order as OrderModel;
|
|
|
use app\model\order\OrderCommon;
|
|
@@ -36,17 +38,21 @@ class Order extends BaseApi
|
|
|
$order_id = isset($this->params['order_id']) ? $this->params['order_id'] : 0;
|
|
|
$result = $order_common_model->getMemberOrderDetail($order_id, $this->member_id);
|
|
|
$goods_model = new \app\model\goods\Goods();
|
|
|
+ $member_model = new Member();
|
|
|
+ $vip_model= new MemberVip();
|
|
|
+ $member_info_result = $member_model->getMemberDetail($this->member_id);
|
|
|
+ print_r($member_info_result);die;
|
|
|
+ $member_info = $member_info_result["data"];
|
|
|
+ $vip_info = $vip_model->getMemberVipInfo([['id','=',]]);
|
|
|
+ $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']['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']);
|
|
|
-
|
|
|
- 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'];
|
|
|
- }
|
|
|
+ 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'];
|
|
|
+ }
|
|
|
|
|
|
return $this->response($result);
|
|
|
}
|