向供货商 APP 发送新订单通知的消息体的门店是采购者的门店

app-ghs/controllers/OrderController.php

@@ -1662,8 +1662,9 @@ class OrderController extends BaseController
                 //NoticeClass::ghsNewOrderNotice($order);
 
                 //向供货商APP发通知
+                $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                 $push = new push('ghs', push::MSG_TYPE_ORDER);
-                $push->ghsOrderMessage($shop, $order);
+                $push->ghsOrderMessage($shop, $cgShop, $order);
             }
         }
 

app-hd/controllers/NoticeController.php

@@ -240,8 +240,9 @@ class NoticeController extends PublicController
                             Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
                             //向供货商APP发通知
+                            $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                             $push = new push('ghs', push::MSG_TYPE_ORDER);
-                            $push->ghsOrderMessage($shop, $order);
+                            $push->ghsOrderMessage($shop, $cgShop, $order);
                         }
                         //花店采购供货商端APP收到通知
                         //NoticeClass::ghsNewOrderNotice($order);
@@ -471,8 +472,9 @@ class NoticeController extends PublicController
                             Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
                             //向供货商APP发通知
+                            $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                             $push = new push('ghs', push::MSG_TYPE_ORDER);
-                            $push->ghsOrderMessage($shop, $order);
+                            $push->ghsOrderMessage($shop, $cgShop, $order);
                         }
                         //花店采购供货商端APP收到通知
                         //NoticeClass::ghsNewOrderNotice($order);
@@ -856,8 +858,9 @@ class NoticeController extends PublicController
                                 Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
                                 //向供货商端APP发通知
+                                $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                                 $push = new push('ghs', push::MSG_TYPE_ORDER);
-                                $push->ghsOrderMessage($shop, $order);
+                                $push->ghsOrderMessage($shop, $cgShop, $order);
                             }
                             //花店采购供货商端APP收到通知
                             //NoticeClass::ghsNewOrderNotice($order);

app-hd/controllers/PurchaseController.php

@@ -770,8 +770,9 @@ class PurchaseController extends BaseController
                     Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
                     //向供货商APP发通知
+                    $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                     $push = new push('ghs', push::MSG_TYPE_ORDER);
-                    $push->ghsOrderMessage($shop, $order);
+                    $push->ghsOrderMessage($shop, $cgShop, $order);
                 }
                 //订单生成时唤起在线打印
                 if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {

common/components/push.php

@@ -277,17 +277,18 @@ class push
 
     /**
      * 向供货商 APP 发送新订单通知
-     * @param ActiveRecord $shop
-     * @param ActiveRecord $order
+     * @param ActiveRecord $shop 供货商门店
+     * @param ActiveRecord $cgShop 采购花店门店
+     * @param ActiveRecord $order xhGhsOrder
      * @throws \Exception
      */
-    public function ghsOrderMessage($shop, $order)
+    public function ghsOrderMessage($shop, $cgShop, $order)
     {
         try {
             $allDevices = \bizGhs\device\classes\GhsDeviceClass::getAllByCondition(['shopId'=>$shop->id]);
             $cids = array_column($allDevices, 'clientId');
             $title = '你有新的订单';
-            $shopName = $shop->merchantName . ($shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '');
+            $shopName = $cgShop->merchantName . ($cgShop->shopName != '首店' ? '（' . $cgShop->shopName . '）' : '');
             $content = $shopName . ' ¥' . $order->actPrice;
             $payload = [
                 "page" => "pagesOrder/detail",

console/controllers/MqController.php

@@ -52,8 +52,9 @@ class MqController extends Controller
                         WxMessageClass::ghsHasNewOrderInform($shop, $order);
 
                         // 向供货商App发通知
+                        $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
                         $push = new push('ghs', push::MSG_TYPE_ORDER);
-                        $push->ghsOrderMessage($shop, $order);
+                        $push->ghsOrderMessage($shop, $cgShop, $order);
                     }
                 }
             }