mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拼接订单属地

Browse Source
This commit is contained in:
chan 2023-12-11 18:38:23 +08:00
parent fdf09d471b
commit 24a41b8302
1 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controller/api/dataview/Order.php
View File

@ -9,6 +9,7 @@ use app\common\repositories\BaseRepository;
use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreOrderRepository;
use app\common\repositories\store\order\StoreRefundOrderRepository; use app\common\repositories\store\order\StoreRefundOrderRepository;
use crmeb\basic\BaseController; use crmeb\basic\BaseController;
use Exception;
use think\App; use think\App;
use think\exception\ValidateException; use think\exception\ValidateException;
use think\facade\Db; use think\facade\Db;
@ -562,12 +563,14 @@ class Order extends BaseController
// 退款订单列表 // 退款订单列表
public function refundOrderList(StoreRefundOrderRepository $repository) public function refundOrderList(StoreRefundOrderRepository $repository)
{ {
try{
[$page,$limit] = $this->getPage(); [$page,$limit] = $this->getPage();
$where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']); $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
$list = $repository->getAllList($where, $page, $limit); $list = $repository->getAllList($where, $page, $limit);
$list['list'] = $list['list']->toArray(); $list['list'] = $list['list']->toArray();
foreach($list['list'] as &$item) { foreach($list['list'] as &$item) {
$userAddressCode = explode(',', $item['order']['user_address_code'])??[]; if(!empty($item['order'])) {
$userAddressCode = explode(',', $item['order']['user_address_code']??'')??[];
if(!empty($userAddressCode)) { if(!empty($userAddressCode)) {
$area = Db::name('geo_area')->where('area_code', $userAddressCode[2])->value('area_name'); $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'); $street = Db::name('geo_street')->where('street_code', $userAddressCode[3])->value('street_name');
@ -575,10 +578,14 @@ class Order extends BaseController
} else { } else {
$item['order']['order_from'] = ''; $item['order']['order_from'] = '';
} }
}
} }
unset($item); unset($item);
return app('json')->success($list); return app('json')->success($list);
} catch(Exception $e) {
throw new ValidateException($e->getFile().$e->getLine().$e->getMessage());
}
} }
// 核销订单 // 核销订单
@ -607,7 +614,8 @@ class Order extends BaseController
$count = $query->count(); $count = $query->count();
$list = $query->page($page, $limit)->select(); $list = $query->page($page, $limit)->select();
foreach($list as &$item) { foreach($list as &$item) {
$userAddressCode = explode(',', $item['user_address_code'])??[]; if(!empty($item['order'])) {
$userAddressCode = explode(',', $item['user_address_code']??'')??[];
if(!empty($userAddressCode)){ if(!empty($userAddressCode)){
$area = Db::name('geo_area')->where('area_code', $userAddressCode[2])->value('area_name'); $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'); $street = Db::name('geo_street')->where('street_code', $userAddressCode[3])->value('street_name');
@ -615,6 +623,8 @@ class Order extends BaseController
} else{ } else{
$item['order_from'] = ''; $item['order_from'] = '';
} }
}
} }
return app('json')->success(compact('count', 'list')); return app('json')->success(compact('count', 'list'));