Merge branch 'zhongqi-delivery' into dev

biz-ghs/express/classes/GhsDeliveryOrderClass.php

@@ -263,8 +263,10 @@ class GhsDeliveryOrderClass extends BaseClass
                 return ConsumerInterface::MSG_REJECT;
             }
         } catch (\Exception $e) {
+            $orderId = $data['orderId'];
             Yii::error("ghs-orderId={$orderId}, 创建跑腿失败:" . $e->getMessage());
             noticeUtil::push("ghs-orderId={$orderId}, 创建跑腿失败:" . $e->getMessage());
+            $shopId = $data['shopId'];
             // 发 App 通知
             self::sendAppNotice($shopId, $orderId, $e->getMessage());
 

biz-hd/express/classes/HdDeliveryOrderClass.php

@@ -248,8 +248,10 @@ class HdDeliveryOrderClass extends BaseClass
                 return ConsumerInterface::MSG_REJECT;
             }
         } catch (\Exception $e) {
+            $orderId = $data['orderId'];
             Yii::error("hd-orderId={$orderId} 创建跑腿失败:" . $e->getMessage());
             noticeUtil::push("hd-orderId={$orderId} 创建跑腿失败:" . $e->getMessage());
+            $shopId = $data['shopId'];
             // 发 App 通知
             self::sendAppNotice($shopId, $orderId, $e->getMessage());