From 2d456c4fcf821168354a2a3ce7589b4e6af1eaac Mon Sep 17 00:00:00 2001 From: chan <709206448@qq.com> Date: Mon, 11 Dec 2023 18:22:58 +0800 Subject: [PATCH] dindgan shudi --- app/controller/api/dataview/Order.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index d37dff18..32439010 100755 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -568,10 +568,14 @@ class Order extends BaseController $list['list'] = $list['list']->toArray(); foreach($list['list'] as &$item) { $userAddressCode = explode(',', $item['order']['user_address_code']); - halt($userAddressCode); - $area = Db::name('geo_area')->where('area_code', $userAddressCode[2])->value('area_name'); - $street = Db::name('geo_street')->where('street_code', $userAddressCode[3])->value('street_name'); - $item['order']['order_from'] = $area.$street; + if(!empty($userAddressCode)) { + $area = Db::name('geo_area')->where('area_code', $userAddressCode[2])->value('area_name'); + $street = Db::name('geo_street')->where('street_code', $userAddressCode[3])->value('street_name'); + $item['order']['order_from'] = $area.$street; + } else { + $item['order']['order_from'] = ''; + } + } unset($item); return app('json')->success($list); @@ -604,9 +608,14 @@ class Order extends BaseController $list = $query->page($page, $limit)->select(); foreach($list as &$item) { $userAddressCode = explode(',', $item['user_address_code']); - $area = Db::name('geo_area')->where('area_code', $userAddressCode[2])->value('area_name'); - $street = Db::name('geo_street')->where('street_code', $userAddressCode[3])->value('street_name'); - $item['order_from'] = $area.$street; + if(!empty($userAddressCode)){ + $area = Db::name('geo_area')->where('area_code', $userAddressCode[2])->value('area_name'); + $street = Db::name('geo_street')->where('street_code', $userAddressCode[3])->value('street_name'); + $item['order_from'] = $area.$street; + } else{ + $item['order_from'] = ''; + } + } return app('json')->success(compact('count', 'list')); }