shizhongqi 10 сар өмнө
parent
commit
3d26374abe

+ 3 - 2
app-ghs/controllers/OrderController.php

@@ -34,6 +34,7 @@ use common\components\util;
 use biz\shop\classes\ShopAdminClass;
 use biz\shop\classes\ShopClass;
 use common\components\lakala\Lakala;
+use common\components\push;
 
 class OrderController extends BaseController
 {
@@ -1350,7 +1351,7 @@ class OrderController extends BaseController
                             "page" => "admin/order/detail",
                             "params" => ["id" => $order->id]
                         ];
-                        $push = new \common\components\push('hd');
+                        $push = new push('hd', push::MSG_TYPE_ORDER);
                         $push->pushByCloud($cids, $title, $content, $payload);
                     }
                 }
@@ -1665,7 +1666,7 @@ class OrderController extends BaseController
                     "page" => "pagesOrder/detail",
                     "params" => ["id" => $order->id]
                 ];
-                $push = new \common\components\push('ghs');
+                $push = new push('ghs', push::MSG_TYPE_ORDER);
                 $push->pushByCloud($cids, $title, $content, $payload);
             }
         }

+ 5 - 4
app-hd/controllers/NoticeController.php

@@ -21,6 +21,7 @@ use biz\wx\classes\WxMessageClass;
 use bizGhs\order\classes\OrderClass;
 use biz\shop\classes\ShopExtClass;
 use common\components\lakala\Lakala;
+use common\components\push;
 
 class NoticeController extends PublicController
 {
@@ -247,7 +248,7 @@ class NoticeController extends PublicController
                                 "page" => "pagesOrder/detail",
                                 "params" => ["id" => $order->id]
                             ];
-                            $push = new \common\components\push('ghs');
+                            $push = new push('ghs', push::MSG_TYPE_ORDER);
                             $push->pushByCloud($cids, $title, $content, $payload);
                         }
                         //花店采购供货商端APP收到通知
@@ -486,7 +487,7 @@ class NoticeController extends PublicController
                                 "page" => "pagesOrder/detail",
                                 "params" => ["id" => $order->id]
                             ];
-                            $push = new \common\components\push('ghs');
+                            $push = new push('ghs', push::MSG_TYPE_ORDER);
                             $push->pushByCloud($cids, $title, $content, $payload);
                         }
                         //花店采购供货商端APP收到通知
@@ -629,7 +630,7 @@ class NoticeController extends PublicController
                                 "page" => "pagesOrder/detail",
                                 "params" => ["id" => $order->id]
                             ];
-                            $push = new \common\components\push('ghs');
+                            $push = new push('ghs', push::MSG_TYPE_ORDER);
                             $push->pushByCloud($cids, $title, $content, $payload);
                         }
                         //花店采购供货商端APP收到通知
@@ -879,7 +880,7 @@ class NoticeController extends PublicController
                                     "page" => "pagesOrder/detail",
                                     "params" => ["id" => $order->id]
                                 ];
-                                $push = new \common\components\push('ghs');
+                                $push = new push('ghs', push::MSG_TYPE_ORDER);
                                 $push->pushByCloud($cids, $title, $content, $payload);
                             }
                             //花店采购供货商端APP收到通知

+ 2 - 1
app-hd/controllers/PurchaseController.php

@@ -23,6 +23,7 @@ use common\components\util;
 use bizGhs\order\services\OrderService;
 use common\components\lakala\Lakala;
 use common\components\qrCodeUtil;
+use common\components\push;
 
 class PurchaseController extends BaseController
 {
@@ -777,7 +778,7 @@ class PurchaseController extends BaseController
                         "page" => "pagesOrder/detail",
                         "params" => ["id" => $order->id]
                     ];
-                    $push = new \common\components\push('ghs');
+                    $push = new push('ghs', push::MSG_TYPE_ORDER);
                     $push->pushByCloud($cids, $title, $content, $payload);
                 }
                 //订单生成时唤起在线打印

+ 3 - 2
console/controllers/MqController.php

@@ -8,6 +8,7 @@ use bizHd\shop\classes\ShopClass;
 use biz\wx\classes\WxMessageClass;
 use yii\console\Controller;
 use bizGhs\order\classes\OrderClass;
+use \common\components\push;
 use Yii;
 
 class MqController extends Controller
@@ -59,8 +60,8 @@ class MqController extends Controller
                             "page" => "pagesOrder/detail",
                             "params" => ["id" => $order->id]
                         ];
-                        $push = new \common\components\push('ghs');
-                        $rs = $push->pushByCloud($cids, $title, $content, $payload);
+                        $push = new push('ghs', push::MSG_TYPE_ORDER);
+                        $push->pushByCloud($cids, $title, $content, $payload);
                     }
                 }
             }