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