|
|
@ -92,7 +92,7 @@ class RechargeController extends AbstractController
|
|
|
|
$outOrderNo = $prePayLog->out_order_no;
|
|
|
|
$outOrderNo = $prePayLog->out_order_no;
|
|
|
|
$nextStep = 'confirm-pay';
|
|
|
|
$nextStep = 'confirm-pay';
|
|
|
|
$amount = $prePayLog->amount > 0 ? $prePayLog->amount : intval($amount * 100);
|
|
|
|
$amount = $prePayLog->amount > 0 ? $prePayLog->amount : intval($amount * 100);
|
|
|
|
$bizData = $this->paymentService->protocolPayPreRequest($this->buildPrepayParams($prePayLog->out_member_id, $outOrderNo, $bankCard->protocol, $amount, $app));
|
|
|
|
$bizData = $this->paymentService->protocolPayPreRequest($this->buildPrepayParams($prePayLog->out_member_id, $outOrderNo, $bankCard->protocol, $amount, $prePayLog->notify_url, $app));
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$mchOrderNo = StringHelper::generateBankCardOrderNo();
|
|
|
|
$mchOrderNo = StringHelper::generateBankCardOrderNo();
|
|
|
|
$nextStep = 'confirm-bind';
|
|
|
|
$nextStep = 'confirm-bind';
|
|
|
@ -151,7 +151,7 @@ class RechargeController extends AbstractController
|
|
|
|
return $params;
|
|
|
|
return $params;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private function buildPrepayParams($outMemberId, $outOrderNo, $protocol, $amount, $app)
|
|
|
|
private function buildPrepayParams($outMemberId, $outOrderNo, $protocol, $amount, $notifyUrl, $app)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
$params = [
|
|
|
|
$params = [
|
|
|
|
'app_id' => $app->app_id,
|
|
|
|
'app_id' => $app->app_id,
|
|
|
@ -162,6 +162,7 @@ class RechargeController extends AbstractController
|
|
|
|
'outOrderNo' => $outOrderNo,
|
|
|
|
'outOrderNo' => $outOrderNo,
|
|
|
|
'protocol' => $protocol,
|
|
|
|
'protocol' => $protocol,
|
|
|
|
'payAmount' => $amount,
|
|
|
|
'payAmount' => $amount,
|
|
|
|
|
|
|
|
'notifyUrl' => $notifyUrl,
|
|
|
|
]),
|
|
|
|
]),
|
|
|
|
];
|
|
|
|
];
|
|
|
|
$sign = \App\Helper\Platform\Signer::sign($params, $app->app_key);
|
|
|
|
$sign = \App\Helper\Platform\Signer::sign($params, $app->app_key);
|
|
|
|