|
|
@@ -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()
|
|
|
{
|
|
|
@@ -172,6 +172,12 @@ class OrderController extends BaseController
|
|
|
$shop = ShopService::getById($shopId);
|
|
|
}
|
|
|
$telephone = isset($shop['telephone']) ? $shop['telephone'] : '';
|
|
|
+ $bookName = isset($order['bookName']) ? $order['bookName'] : '';
|
|
|
+ $bookMobile = isset($order['bookMobile']) ? $order['bookMobile'] : '';
|
|
|
+ if (isset($order['anonymity']) && $order['anonymity'] == 1) {
|
|
|
+ $bookName = '--';
|
|
|
+ $bookMobile = '--';
|
|
|
+ }
|
|
|
$data = [
|
|
|
'reachDate' => $reachDate . ' ' . $reachPeriod,
|
|
|
'orderSn' => $order['orderSn'],
|
|
|
@@ -179,8 +185,8 @@ class OrderController extends BaseController
|
|
|
'receiveMobile' => $order['receiveMobile'],
|
|
|
'receiveFullAddress' => $order['receiveFullAddress'],
|
|
|
'cardInfo' => $order['cardInfo'],
|
|
|
- 'bookMobile' => $order['bookMobile'],
|
|
|
- 'bookName' => $order['bookName'],
|
|
|
+ 'bookMobile' => $bookMobile,
|
|
|
+ 'bookName' => $bookName,
|
|
|
'remark' => $order['remark'],
|
|
|
'sendNum' => $order['sendNum'],
|
|
|
'telephone' => 17189513228,
|
|
|
@@ -189,5 +195,5 @@ class OrderController extends BaseController
|
|
|
];
|
|
|
util::success($data);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
shish