|
|
@@ -188,12 +188,12 @@ class DeliveryController extends BaseController
|
|
|
util::checkRepeatCommit($adminId, 4);
|
|
|
|
|
|
$orderId = intval($post['orderId']);
|
|
|
- $order = OrderClass::getById($orderId, false, 'fullAddress');
|
|
|
- $shop = ShopClass::getById($this->shopId, false, 'fullAddress');
|
|
|
+ $order = OrderClass::getById($orderId, false, 'fullAddress, long, lat');
|
|
|
+ $shop = ShopClass::getById($this->shopId, false, 'fullAddress, long, lat');
|
|
|
|
|
|
$ret = [
|
|
|
- "send_address" => $shop['fullAddress'],
|
|
|
- "receive_address" => $order['fullAddress']
|
|
|
+ "sender" => $shop,
|
|
|
+ "receiver" => $order
|
|
|
];
|
|
|
util::success($ret, "success");
|
|
|
}
|