mirror of
https://gitee.com/technical-laohu/mpay_v2_webman.git
synced 2026-05-17 06:20:25 +08:00
feat: 完善支付通道和收款监听链路
新增 ChannelNotifyPayloadInterface 等支付插件通知契约,规范 pay_no 定位和插件返回校验。 新增微信、支付宝、收钱吧、Postar 个人收款插件适配,支持余额识别与备注识别。 新增 receipt-watcher 后端进程、Redis 队列 job 和平台事件监听,覆盖收款流水通知、商户通知、退款派发、转账派发与清算完成。 补齐个人收款监听相关系统配置、仓储、服务费冻结明细、订单后台操作和通道测试能力。 重构支付单创建、回调、费用、风控、结算和通道统计链路,统一状态流转与幂等处理。
This commit is contained in:
@@ -136,7 +136,7 @@ class MerchantAuthService extends BaseService
|
||||
* @param string $password 密码
|
||||
* @param string $ip 请求 IP
|
||||
* @param string $userAgent 用户代理
|
||||
* @return array{token: string, expires_in: int, merchant: Merchant, credential: array{status: int, sign_type: int, last_used_at: mixed}|null} 登录结果
|
||||
* @return array{token: string, expires_in: int, merchant: Merchant, credential: array{status: int, last_used_at: mixed}|null} 登录结果
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function authenticateCredentials(string $merchantNo, string $password, string $ip = '', string $userAgent = ''): array
|
||||
@@ -183,7 +183,7 @@ class MerchantAuthService extends BaseService
|
||||
* @param int $ttlSeconds 过期秒数
|
||||
* @param string $ip 请求 IP
|
||||
* @param string $userAgent 用户代理
|
||||
* @return array{token: string, expires_in: int, merchant: Merchant, credential: array{status: int, sign_type: int, last_used_at: mixed}|null} 登录结果
|
||||
* @return array{token: string, expires_in: int, merchant: Merchant, credential: array{status: int, last_used_at: mixed}|null} 登录结果
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function issueToken(int $merchantId, int $ttlSeconds = 86400, string $ip = '', string $userAgent = ''): array
|
||||
@@ -213,7 +213,6 @@ class MerchantAuthService extends BaseService
|
||||
'merchant' => $merchant,
|
||||
'credential' => $credential ? [
|
||||
'status' => (int) ($credential->status ?? 0),
|
||||
'sign_type' => (int) ($credential->sign_type ?? 0),
|
||||
'last_used_at' => $credential->last_used_at,
|
||||
] : null,
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user