diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 894f1833a..0ee0d5be4 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -367,7 +367,8 @@ class OrderController extends BaseApiController 'id' => $order_id, 'uid' => $this->userId, ]; - $order = OrderLogic::detail($where); + $url = 'https://'.$this->request->host(true); + $order = OrderLogic::detail($where,$url); if ($order) { return $this->data($order); } else { diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php index e779a853d..f1ba4dd47 100644 --- a/app/api/lists/order/OrderList.php +++ b/app/api/lists/order/OrderList.php @@ -54,7 +54,7 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface $item['goods_list'] = StoreOrderCartInfo::where('oid', $item['id']) ->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time,old_cart_id')->limit(3)->select() ->each(function ($v) use ($item) { - $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->find(); + $find = StoreBranchProduct::where('product_id', $v['product_id'])->where('store_id', $item['store_id'])->withTrashed()->find(); $v['store_name'] = $find['store_name']; $v['image'] = $find['image']; $v['price'] = $find['price']; @@ -67,6 +67,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface if ($item['pay_time']) { $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); } + if($item['verify_img']){ + $item['verify_img'] = 'https://'.$this->request->host(true).$item['verify_img']; + } }) ->toArray(); diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 3e01812db..d7e64fbcb 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -360,7 +360,7 @@ class OrderLogic extends BaseLogic } - public static function detail($params): array + public static function detail($params,$url=''): array { $find = StoreOrder::where($params)->findOrEmpty()->toArray(); if ($find) { @@ -378,6 +378,10 @@ class OrderLogic extends BaseLogic $store = SystemStore::where('id', $find['store_id'])->field('id,name,phone,address,detailed_address')->find(); $find['store_info'] = $store; + + if($find['verify_img']){ + $find['verify_img'] = $url.$find['verify_img']; + } } return $find; }