支付通知

app-hd/controllers/NoticeController.php

@@ -269,6 +269,7 @@ class NoticeController extends PublicController
         $orderSn = $postData['out_trade_no'] ?? '';
         $total_amount = $postData['total_amount'] ?? 0;
         $account_type = $postData['account_type'] ?? '';
+        $settle_merchant_no = $postData['settle_merchant_no']??'';
         if (empty($account_type)) {
             noticeUtil::push('支付回调失败了，没有找到钱包类型，请注意，orderSn:' . $orderSn, '15280215347');
             util::end();
@@ -304,7 +305,7 @@ class NoticeController extends PublicController
                 util::end();
             }
             //支付成功后续流程
-            $attach = '';
+            $attach = 'settle_merchant_no='.$settle_merchant_no;
             payUtil::thirdPay($currentPayWay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
             $transaction->commit();
             echo "SUCCESS";

biz-hd/purchase/classes/PurchaseClearClass.php

@@ -99,12 +99,12 @@ class PurchaseClearClass extends BaseClass
     {
         $info = self::getByCondition(['orderSn' => $orderSn], true);
         if (empty($info)) {
-            $msg = "没有找到清算订单 orderSn:{$orderSn}";
+            $msg = "没有找到清算订单 orderSn:{$orderSn} {$attach}";
             Yii::info($msg);
             util::fail($msg);
         }
         if ($info->actPrice != $totalFee) {
-            $msg = "清算订单金额与回调通知金额不一致 orderSn:{$orderSn} {$info->actPrice} {$totalFee}";
+            $msg = "清算订单金额与回调通知金额不一致 orderSn:{$orderSn} {$info->actPrice} {$totalFee} {$attach}";
             Yii::info($msg);
             util::fail($msg);
         }

biz-hd/purchase/services/PurchaseService.php

@@ -280,13 +280,13 @@ class PurchaseService extends BaseService
     {
         $info = self::getByCondition(['orderSn' => $orderSn], true);
         if (empty($info)) {
-            noticeUtil::push('花店采购，付款成功，支付回调，单号：' . $orderSn . '，没有找到订单', '15280215347');
+            noticeUtil::push('花店采购，付款成功，支付回调，单号：' . $orderSn . '，没有找到订单 '.$attach, '15280215347');
             $msg = "没有找到订单 orderSn:{$orderSn}";
             Yii::info($msg);
             util::fail($msg);
         }
         if ($info->actPrice != $totalFee) {
-            noticeUtil::push("花店采购，付款成功，支付回调，单号：{$orderSn}，订单金额与回调通知金额不一致{$info->actPrice} {$totalFee}", '15280215347');
+            noticeUtil::push("花店采购，付款成功，支付回调，单号：{$orderSn}，订单金额与回调通知金额不一致{$info->actPrice} {$totalFee} {$attach}", '15280215347');
             $msg = "订单金额与回调通知金额不一致 orderSn:{$orderSn} {$info->actPrice} {$totalFee}";
             Yii::info($msg);
             util::fail($msg);