优化级问题

app-ghs/controllers/OrderController.php

@@ -1349,7 +1349,7 @@ class OrderController extends BaseController
                         $allDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['shopId'=>$custom['shopId']]);
                         $cids = array_column($allDevices, 'clientId');
                         $title = '买花成功';
-                        $shopName = $customShop->merchantName . $customShop->shopName != '首店' ? '（' . $customShop->shopName . '）' : '';
+                        $shopName = $customShop->merchantName . ($customShop->shopName != '首店' ? '（' . $customShop->shopName . '）' : '');
                         $content = $shopName . ' ¥' . $order->actPrice;
                         $payload = [
                             "page" => "pagesPurchase/purDetails",

common/components/push.php

@@ -287,7 +287,7 @@ class push
             $allDevices = \bizGhs\device\classes\GhsDeviceClass::getAllByCondition(['shopId'=>$shop->shopId]);
             $cids = array_column($allDevices, 'clientId');
             $title = '你有新的订单';
-            $shopName = $shop->merchantName . $shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '';
+            $shopName = $shop->merchantName . ($shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '');
             $content = $shopName . ' ¥' . $order->actPrice;
             $payload = [
                 "page" => "pagesOrder/detail",