From 24a41b8302c51da743618086de35b66ba3b9edb1 Mon Sep 17 00:00:00 2001 From: chan <709206448@qq.com> Date: Mon, 11 Dec 2023 18:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E8=AE=A2=E5=8D=95=E5=B1=9E?= =?UTF-8?q?=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/dataview/Order.php | 54 ++++++++++++++++----------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php index 54592826..c0593432 100755 --- a/app/controller/api/dataview/Order.php +++ b/app/controller/api/dataview/Order.php @@ -9,6 +9,7 @@ use app\common\repositories\BaseRepository; use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreRefundOrderRepository; use crmeb\basic\BaseController; +use Exception; use think\App; use think\exception\ValidateException; use think\facade\Db; @@ -562,23 +563,29 @@ class Order extends BaseController // 退款订单列表 public function refundOrderList(StoreRefundOrderRepository $repository) { - [$page,$limit] = $this->getPage(); - $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']); - $list = $repository->getAllList($where, $page, $limit); - $list['list'] = $list['list']->toArray(); - foreach($list['list'] as &$item) { - $userAddressCode = explode(',', $item['order']['user_address_code'])??[]; - 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'] = ''; + try{ + [$page,$limit] = $this->getPage(); + $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']); + $list = $repository->getAllList($where, $page, $limit); + $list['list'] = $list['list']->toArray(); + foreach($list['list'] as &$item) { + if(!empty($item['order'])) { + $userAddressCode = explode(',', $item['order']['user_address_code']??'')??[]; + 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); + } catch(Exception $e) { + throw new ValidateException($e->getFile().$e->getLine().$e->getMessage()); } - unset($item); - return app('json')->success($list); + } // 核销订单 @@ -607,14 +614,17 @@ class Order extends BaseController $count = $query->count(); $list = $query->page($page, $limit)->select(); foreach($list as &$item) { - $userAddressCode = explode(',', $item['user_address_code'])??[]; - 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'] = ''; + if(!empty($item['order'])) { + $userAddressCode = explode(',', $item['user_address_code']??'')??[]; + 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'));