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:
@@ -4,6 +4,7 @@ namespace app\http\mer\controller\system;
|
||||
|
||||
use app\common\base\BaseController;
|
||||
use app\service\bootstrap\SystemBootstrapService;
|
||||
use app\service\system\config\SystemPublicConfigService;
|
||||
use support\Request;
|
||||
use support\Response;
|
||||
|
||||
@@ -11,17 +12,20 @@ use support\Response;
|
||||
* 商户后台系统数据控制器。
|
||||
*
|
||||
* @property SystemBootstrapService $systemBootstrapService 系统引导服务
|
||||
* @property SystemPublicConfigService $systemPublicConfigService 系统公开配置服务
|
||||
*/
|
||||
class SystemController extends BaseController
|
||||
{
|
||||
/**
|
||||
* 构造方法。
|
||||
* 构造方法。
|
||||
*
|
||||
* @param SystemBootstrapService $systemBootstrapService 系统引导服务
|
||||
* @param SystemPublicConfigService $systemPublicConfigService 系统公开配置服务
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(
|
||||
protected SystemBootstrapService $systemBootstrapService
|
||||
protected SystemBootstrapService $systemBootstrapService,
|
||||
protected SystemPublicConfigService $systemPublicConfigService
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -46,6 +50,17 @@ class SystemController extends BaseController
|
||||
{
|
||||
return $this->success($this->systemBootstrapService->getDictItems((string) $request->get('code', '')));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取商户后台公开展示配置。
|
||||
*
|
||||
* @param Request $request 请求对象
|
||||
* @return Response 响应对象
|
||||
*/
|
||||
public function publicConfig(Request $request): Response
|
||||
{
|
||||
return $this->success($this->systemPublicConfigService->merchantPortal());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -45,7 +45,6 @@ class MerchantPortalValidator extends Validator
|
||||
'status' => 'sometimes|integer|in:0,1',
|
||||
'rotate_v1' => 'sometimes|integer|in:0,1',
|
||||
'rotate_v2' => 'sometimes|integer|in:0,1',
|
||||
'sign_type' => 'sometimes|integer|in:0,1',
|
||||
'sort_no' => 'nullable|integer|min:0',
|
||||
'page' => 'sometimes|integer|min:1',
|
||||
'page_size' => 'sometimes|integer|min:1|max:100',
|
||||
@@ -87,7 +86,6 @@ class MerchantPortalValidator extends Validator
|
||||
'status' => '状态',
|
||||
'rotate_v1' => 'V1 凭证',
|
||||
'rotate_v2' => 'V2 凭证',
|
||||
'sign_type' => '签名类型',
|
||||
'sort_no' => '排序',
|
||||
'page' => '页码',
|
||||
'page_size' => '每页条数',
|
||||
@@ -118,7 +116,7 @@ class MerchantPortalValidator extends Validator
|
||||
'channelStore' => ['name', 'pay_type_id', 'plugin_code', 'api_config_id', 'daily_limit_amount', 'daily_limit_count', 'min_amount', 'max_amount', 'remark', 'status', 'sort_no'],
|
||||
'channelUpdate' => ['id', 'name', 'pay_type_id', 'plugin_code', 'api_config_id', 'daily_limit_amount', 'daily_limit_count', 'min_amount', 'max_amount', 'remark', 'status', 'sort_no'],
|
||||
'channelDestroy' => ['id'],
|
||||
'issueCredential' => ['rotate_v1', 'rotate_v2', 'sign_type', 'status'],
|
||||
'issueCredential' => ['rotate_v1', 'rotate_v2', 'status'],
|
||||
];
|
||||
|
||||
public function rules(): array
|
||||
|
||||
Reference in New Issue
Block a user