Merge branch 'master' into ls

biz-hd/order/classes/OrderClass.php

@@ -226,13 +226,13 @@ class OrderClass extends BaseClass
     {
         $order = self::getByCondition(['orderSn' => $orderSn], true);
         if (empty($order)) {
-            noticeUtil::push('散客下单，付款成功，支付回调，单号：' . $orderSn . ' 金额：' . $totalFee . ' 回调id：' . $transactionId . '，没有找到订单', '15280215347');
+            noticeUtil::push('散客下单，付款成功，支付回调，单号：' . $orderSn . ' 金额：' . $totalFee . ' 回调id：' . $transactionId . ' 附件：' . $attach . '，没有找到订单', '15280215347');
             $msg = "没有找到零售订单 orderSn:{$orderSn}";
             Yii::info($msg);
             util::fail($msg);
         }
         if ($order->mainPay != $totalFee) {
-            noticeUtil::push("散客下单，付款成功，支付回调错误，零售订单金额与回调通知金额不一致 orderSn:{$orderSn} {$order->mainPay} {$totalFee}", '15280215347');
+            noticeUtil::push("散客下单，付款成功，支付回调错误，零售订单金额与回调通知金额不一致 orderSn:{$orderSn} {$order->mainPay} {$totalFee} 附件：{$attach}", '15280215347');
             $msg = "零售订单金额与回调通知金额不一致 orderSn:{$orderSn} {$order->mainPay} {$totalFee}";
             Yii::info($msg);
             util::fail($msg);