|
@@ -458,9 +458,9 @@ class OrderController extends BaseController
|
|
|
$name = !empty($order['orderName']) ? $order['orderName'] : '购买花材';
|
|
$name = !empty($order['orderName']) ? $order['orderName'] : '购买花材';
|
|
|
$shop = $this->shop;
|
|
$shop = $this->shop;
|
|
|
if (empty($shop)) {
|
|
if (empty($shop)) {
|
|
|
- util::fail('没有找到门店');
|
|
|
|
|
|
|
+ util::fail('没有找到门店信息');
|
|
|
}
|
|
}
|
|
|
- if (!empty($shop->shopName)) {
|
|
|
|
|
|
|
+ if (isset($shop->shopName) && !empty($shop->shopName)) {
|
|
|
$name .= '(' . $shop->shopName . ')';
|
|
$name .= '(' . $shop->shopName . ')';
|
|
|
}
|
|
}
|
|
|
$totalFee = $order['mainPay'];
|
|
$totalFee = $order['mainPay'];
|
