fix: 支付回调签名验证改用网关原始参数;结果页返回卡密信息;SMTP主题UTF-8编码;清理旧assets残留
This commit is contained in:
1 parent
3ff9c41d18
commit
423ac0d3b5
474 files changed
+288
-3308
No files matched your search
@@ -382,24 +382,37 @@ class PublicController extends Controller
|
||||
{
|
||||
$input = $this->getJsonInput();
|
||||
|
||||
$tradeNo = $input['trade_no'] ?? '';
|
||||
$outTradeNo = $input['out_trade_no'] ?? '';
|
||||
$tradeStatus = $input['trade_status'] ?? '';
|
||||
$sign = $input['sign'] ?? '';
|
||||
$signType = $input['sign_type'] ?? '';
|
||||
$money = $input['money'] ?? '';
|
||||
// 优先使用网关原始回调串(含 name 等全部参数),前端裁剪字段会导致签名不一致
|
||||
$signParams = [];
|
||||
if (!empty($input['sign_params']) && is_string($input['sign_params'])) {
|
||||
parse_str($input['sign_params'], $signParams);
|
||||
}
|
||||
if (!$signParams) {
|
||||
$signParams = $input;
|
||||
}
|
||||
unset($signParams['sign_params']);
|
||||
|
||||
$tradeNo = $signParams['trade_no'] ?? '';
|
||||
$outTradeNo = $signParams['out_trade_no'] ?? '';
|
||||
$tradeStatus = $signParams['trade_status'] ?? '';
|
||||
$sign = $signParams['sign'] ?? ($input['sign'] ?? '');
|
||||
$signType = $signParams['sign_type'] ?? ($input['sign_type'] ?? '');
|
||||
$money = $signParams['money'] ?? ($input['money'] ?? '');
|
||||
|
||||
if (!$outTradeNo || !$sign) {
|
||||
$this->error('参数不完整');
|
||||
}
|
||||
|
||||
// 验证签名
|
||||
// 验证签名(与网关 getSignContent 一致:跳过空值和 sign/sign_type)
|
||||
$appKey = $this->getPaymentConfig('payment_app_key', config('app.payment.app_key', ''));
|
||||
$params = $input;
|
||||
$params = $signParams;
|
||||
unset($params['sign'], $params['sign_type']);
|
||||
ksort($params);
|
||||
$signStr = '';
|
||||
foreach ($params as $k => $v) {
|
||||
if (is_array($v) || trim((string) $v) === '') {
|
||||
continue;
|
||||
}
|
||||
$signStr .= $k . '=' . $v . '&';
|
||||
}
|
||||
$signStr = rtrim($signStr, '&');
|
||||
@@ -430,14 +443,17 @@ class PublicController extends Controller
|
||||
FROM {$db->table('authorizations')} WHERE bot_qq = ? AND contact_qq = ?",
|
||||
[$order['bot_qq'] ?? '', $order['contact_qq'] ?? '']
|
||||
);
|
||||
$cardInfo = $this->getOrderCardInfo($order);
|
||||
$this->success([
|
||||
'order_no' => $order['order_no'],
|
||||
'status' => 'paid',
|
||||
'bot_qq' => $auth['bot_qq'] ?? $order['bot_qq'] ?? '',
|
||||
'contact_qq' => $auth['contact_qq'] ?? $order['contact_qq'] ?? '',
|
||||
'project_name' => $auth['project_name'] ?? '',
|
||||
'project_name' => $auth['project_name'] ?? ($cardInfo['project_name'] ?? ''),
|
||||
'expire_time' => $auth['expire_time'] ?? null,
|
||||
'amount' => $order['amount'],
|
||||
'card_key' => $cardInfo['card_key'],
|
||||
'card_type_name' => $cardInfo['card_type_name'],
|
||||
'is_renew' => ($auth['bot_qq'] ?? false) ? true : false,
|
||||
], '订单已支付');
|
||||
return;
|
||||
@@ -465,6 +481,12 @@ class PublicController extends Controller
|
||||
$orderController = new OrderController();
|
||||
$orderController->processOrderPaid($order['id']);
|
||||
|
||||
// 重新读取订单(自动发卡后 card_id 已回写)
|
||||
$paidOrder = $db->fetch("SELECT * FROM {$db->table('orders')} WHERE id = ?", [$order['id']]);
|
||||
if ($paidOrder) {
|
||||
$order = $paidOrder;
|
||||
}
|
||||
|
||||
// 查询生成的授权
|
||||
$auth = $db->fetch(
|
||||
"SELECT bot_qq, contact_qq, expire_time, project_name
|
||||
@@ -472,18 +494,51 @@ class PublicController extends Controller
|
||||
[$order['bot_qq'] ?? '', $order['contact_qq'] ?? '']
|
||||
);
|
||||
|
||||
$cardInfo = $this->getOrderCardInfo($order);
|
||||
|
||||
$this->success([
|
||||
'order_no' => $outTradeNo,
|
||||
'status' => 'paid',
|
||||
'bot_qq' => $auth['bot_qq'] ?? $order['bot_qq'] ?? '',
|
||||
'contact_qq' => $auth['contact_qq'] ?? $order['contact_qq'] ?? '',
|
||||
'project_name' => $auth['project_name'] ?? '',
|
||||
'project_name' => $auth['project_name'] ?? ($cardInfo['project_name'] ?? ''),
|
||||
'expire_time' => $auth['expire_time'] ?? null,
|
||||
'amount' => $order['amount'],
|
||||
'card_key' => $cardInfo['card_key'],
|
||||
'card_type_name' => $cardInfo['card_type_name'],
|
||||
'is_renew' => $isRenew,
|
||||
], '支付确认成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取订单关联的卡密及商品信息(自动发卡订单)
|
||||
*/
|
||||
private function getOrderCardInfo(array $order): array
|
||||
{
|
||||
$info = ['card_key' => '', 'project_name' => '', 'card_type_name' => ''];
|
||||
if (empty($order['card_id'])) {
|
||||
return $info;
|
||||
}
|
||||
|
||||
try {
|
||||
$db = Database::getInstance();
|
||||
$row = $db->fetch(
|
||||
"SELECT c.card_key, p.name AS project_name, ct.name AS card_type_name
|
||||
FROM {$db->table('cards')} c
|
||||
LEFT JOIN {$db->table('projects')} p ON c.project_id = p.id
|
||||
LEFT JOIN {$db->table('card_types')} ct ON c.card_type_id = ct.id
|
||||
WHERE c.id = ?",
|
||||
[$order['card_id']]
|
||||
);
|
||||
if ($row) {
|
||||
$info = array_merge($info, $row);
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
}
|
||||
|
||||
return $info;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询卡密状态
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user