买花成功通知，内容中显示的是供货商的门店

app-ghs/controllers/OrderController.php

@@ -1343,13 +1343,13 @@ class OrderController extends BaseController
                         //Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
                         Yii::info('向花店App发通知');
-                        $custom = CustomClass::getById($order->customId);
-                        $customShop = ShopClass::getById($custom['shopId'], true, 'merchantName, shopName');
+                        //$custom = CustomClass::getById($order->customId);
+                        //$customShop = ShopClass::getById($custom['shopId'], true, 'merchantName, shopName');
                         //向花店App发通知
                         $allDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['shopId'=>$custom['shopId']]);
                         $cids = array_column($allDevices, 'clientId');
                         $title = '买花成功';
-                        $shopName = $customShop->merchantName . ($customShop->shopName != '首店' ? '（' . $customShop->shopName . '）' : '');
+                        $shopName = $shop->merchantName . ($shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '');
                         $content = $shopName . ' ¥' . $order->actPrice;
                         $payload = [
                             "page" => "pagesPurchase/purDetails",

app-hd/controllers/NoticeController.php

@@ -608,16 +608,9 @@ class NoticeController extends PublicController
                             Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
                             //向供货商端APP发通知
-                            $allDevices = \bizGhs\device\classes\GhsDeviceClass::getAllByCondition(['shopId'=>$shopId]);
-                            $cids = array_column($allDevices, 'clientId');
-                            $title = '你有新的订单';
-                            $content = $shop->shopName . ' ¥' . $order->actPrice;
-                            $payload = [
-                                "page" => "pagesOrder/detail",
-                                "params" => ["id" => $order->id]
-                            ];
+                            $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                             $push = new push('ghs', push::MSG_TYPE_ORDER);
-                            $push->pushByCloud($cids, $title, $content, $payload);
+                            $push->ghsOrderMessage($shop, $cgShop, $order);
                         }
                         //花店采购供货商端APP收到通知
                         //NoticeClass::ghsNewOrderNotice($order);