|
|
@@ -155,7 +155,7 @@ class OrderController extends BaseController
|
|
|
$out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'merchant' => $this->merchant];
|
|
|
util::success($out);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//配送单 shish 2020.2.29
|
|
|
public function actionGetDeliverDetail()
|
|
|
{
|
|
|
@@ -166,6 +166,12 @@ class OrderController extends BaseController
|
|
|
$reachPeriodId = $order['reachPeriod'];
|
|
|
$reachPeriodArr = [0 => '上午', 1 => '下午', 2 => '晚上'];
|
|
|
$reachPeriod = isset($reachPeriodArr[$reachPeriodId]) ? $reachPeriodArr[$reachPeriodId] : '';
|
|
|
+ $shopId = $order['shopId'];
|
|
|
+ $telephone = '';
|
|
|
+ if (!empty($shopId)) {
|
|
|
+ $shop = ShopService::getById($shopId);
|
|
|
+ }
|
|
|
+ $telephone = isset($shop['telephone']) ? $shop['telephone'] : '';
|
|
|
$data = [
|
|
|
'reachDate' => $reachDate . ' ' . $reachPeriod,
|
|
|
'orderSn' => $order['orderSn'],
|
shish