|
@@ -649,12 +649,10 @@ class Order extends Base
|
|
|
|
|
|
// 送货地址
|
|
|
$address = json_decode($order['extend']['address_json'], true);
|
|
|
- $area = (new \addons\unishop\model\Area())
|
|
|
- ->whereIn('id', [$address['province_id'], $address['city_id'], $address['area_id']])
|
|
|
- ->column('name', 'id');
|
|
|
+
|
|
|
$delivery['username'] = $address['name'];
|
|
|
$delivery['mobile'] = $address['mobile'];
|
|
|
- $delivery['address'] = $area[$address['province_id']] . ' ' . $area[$address['city_id']] . ' ' . $area[$address['area_id']] . ' ' . $address['address'];
|
|
|
+ $delivery['address'] = $address['province_name'] . ' ' . $address['city_name'] . ' ' . $address['area_name'] . ' ' . $address['address'];
|
|
|
$order['delivery'] = $delivery;
|
|
|
|
|
|
// 是否已评论
|