dindgan shudi
This commit is contained in:
parent
1ea8630405
commit
2d456c4fcf
@ -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'));
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user