1.更新 2.fix bug

biz-ghs/express/classes/GhsDeliveryOrderClass.php

@@ -252,13 +252,13 @@ class GhsDeliveryOrderClass extends BaseClass
             } else {
                 if (isset($ret['msg'])) {
                     Yii::error("ghs-orderId={$orderId}, 创建跑腿失败:" . $ret['msg']);
-                    noticeUtil::push("订单号:{$orderId}, 原因:" . $ret['msg']);
-                    self::sendAppNotice($shopId, $orderId, "订单号:{$orderId}, 原因:" . $ret['msg']); // 发 App 通知
+                    noticeUtil::push("批发订单号:{$orderId}, 原因:" . $ret['msg']);
+                    self::sendAppNotice($shopId, $orderId, "订单号:{$orderId}，原因:" . $ret['msg']); // 发 App 通知
                     return ConsumerInterface::MSG_REJECT;
                 }
 
                 Yii::error("ghs-orderId={$orderId}, 创建跑腿失败");
-                noticeUtil::push("订单号:{$orderId}, shopId={$shopId},  创建跑腿失败");
+                noticeUtil::push("批发订单号:{$orderId}, shopId={$shopId},  创建跑腿失败");
                 self::sendAppNotice($shopId, $orderId, '创建跑腿失败'); // 发 App 通知
                 return ConsumerInterface::MSG_REJECT;
             }
@@ -268,7 +268,7 @@ class GhsDeliveryOrderClass extends BaseClass
             noticeUtil::push("订单号:{$orderId}, 原因:" . $e->getMessage());
             $shopId = $data['shopId'];
             // 发 App 通知
-            self::sendAppNotice($shopId, $orderId, $e->getMessage());
+            self::sendAppNotice($shopId, $orderId, "订单号:{$orderId}，原因:" . $e->getMessage());
 
             return ConsumerInterface::MSG_REJECT;
         }

biz-hd/express/classes/HdDeliveryOrderClass.php

@@ -97,7 +97,7 @@ class HdDeliveryOrderClass extends BaseClass
                         $data = [
                             'orderId' => $orderId,
                             'mainId' => $order->mainId,
-                            'shopId' => $$order->shopId,
+                            'shopId' => $order->shopId,
                             'platform' => $platform,
                             'ip' => Yii::$app->request->userIP,
                             'deliveryPrice' => $deliveryPrice,
@@ -237,8 +237,8 @@ class HdDeliveryOrderClass extends BaseClass
             } else {
                 if (isset($ret['msg'])) {
                     Yii::error("hd-orderId={$orderId}, 创建跑腿失败:" . $ret['msg']);
-                    noticeUtil::push("订单号:{$orderId}, 原因:" . $ret['msg']);
-                    self::sendAppNotice($shopId, $orderId, "订单号:{$orderId}, 原因:" . $ret['msg']); // 发 App 通知
+                    noticeUtil::push("零售订单号:{$orderId}, 原因:" . $ret['msg']);
+                    self::sendAppNotice($shopId, $orderId, "订单号:{$orderId}，原因:" . $ret['msg']); // 发 App 通知
                     return ConsumerInterface::MSG_REJECT;
                 }
 
@@ -250,10 +250,10 @@ class HdDeliveryOrderClass extends BaseClass
         } catch (\Exception $e) {
             $orderId = $data['orderId'];
             Yii::error("hd-orderId={$orderId} 创建跑腿失败:" . $e->getMessage());
-            noticeUtil::push("订单号:{$orderId} 原因:" . $e->getMessage());
+            noticeUtil::push("零售订单号:{$orderId} 原因:" . $e->getMessage());
             $shopId = $data['shopId'];
             // 发 App 通知
-            self::sendAppNotice($shopId, $orderId, $e->getMessage());
+            self::sendAppNotice($shopId, $orderId, "订单号:{$orderId}，原因:" . $e->getMessage());
             
             return ConsumerInterface::MSG_REJECT;
         }

common/components/rabbitmq/customConsumer.php

@@ -10,7 +10,6 @@ use bizGhs\custom\classes\CustomClass;
 use common\components\noticeUtil;
 use mikemadisonweb\rabbitmq\components\ConsumerInterface;
 use PhpAmqpLib\Message\AMQPMessage;
-use Yii;
 
 class customConsumer implements ConsumerInterface
 {