买花成功通知

app-ghs/controllers/OrderController.php

@@ -1332,31 +1332,15 @@ class OrderController extends BaseController
                 $shop = ShopClass::getById($shopId, true);
                 if (isset($order->payStatus) && $order->payStatus == 1) {
                     if (!empty($shop)) {
-                        //通知员工
+                        //通知批发店员工
                         $noticeText = json_encode(['orderId' => $saleId]);
                         $noticeKey = "hdCgNoticeGhs";
                         Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
 
-                        //通知花店
-                        //$noticeText = json_encode(['id' => $order->purchaseId]);
-                        //$noticeKey = "ghsKdNoticeHd";
-                        //Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
-
-                        Yii::info('向花店App发通知');
-                        //$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 = $shop->merchantName . ($shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '');
-                        $content = $shopName . ' ¥' . $order->actPrice;
-                        $payload = [
-                            "page" => "pagesPurchase/purDetails",
-                            "params" => ["id" => $order->purchaseId]
-                        ];
-//                        $push = new push('hd', push::MSG_TYPE_ORDER);
-//                        $push->pushByCloud($cids, $title, $content, $payload);
+                        //通知花店员工
+                        $noticeText = json_encode(['id' => $order->purchaseId]);
+                        $noticeKey = "ghsKdNoticeHd";
+                        Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
                     }
                 }
                 //订单生成时唤起在线打印

console/controllers/MqController.php

@@ -82,7 +82,7 @@ class MqController extends Controller
         }
     }
 
-    //供货商开单通知花店 ssh 20231129
+    //供货商开单通知花店员工 ssh 20231129
     public function actionGhsKdNoticeHd()
     {
         $noticeKey = "ghsKdNoticeHd";
@@ -96,7 +96,19 @@ class MqController extends Controller
                     $shopId = $cg->shopId ?? 0;
                     $shop = ShopClass::getById($shopId, true);
                     if (!empty($shop)) {
-                        WxMessageClass::hdNewCgOrderInform($shop, $cg);
+
+                        $allDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['shopId'=>$shopId]);
+                        $cids = array_column($allDevices, 'clientId');
+                        $title = '买花成功';
+                        $shopName = $shop->merchantName . ($shop->shopName != '首店' ? '（' . $shop->shopName . '）' : '');
+                        $content = $shopName . ' ¥' . $cg->actPrice;
+                        $payload = [
+                            "page" => "pagesPurchase/purDetails",
+                            "params" => ["id" => $id]
+                        ];
+                        $push = new push('hd', push::MSG_TYPE_ORDER);
+                        $push->pushByCloud($cids, $title, $content, $payload);
+
                     }
                 }
             }