feat(退款): AUG26-006 退款方式选择与原路退款
按 PRD 2.3/2.4/2.5 落地套餐退款的方式矩阵与原路渠道退款: - 退款申请派生并冻结权威实收金额(线上取原成功支付记录,钱包/线下取订单实际收款), 提交人不可填写或修改;按来源支付方式生成可选方式矩阵并在创建、提交、执行前重复校验。 - 审批切换为「每次提交一条不可变审批尝试记录 + 独立企业微信审批实例」,业务标识取尝试 记录主键;终态消费按尝试记录优先、退款申请兜底双读,兼容存量无实例与已关联实例申请。 新增活动退款部分唯一索引 (order_id) WHERE status IN (1,5,6)。 - 本地人工终审保持既有开关,补齐通过入口的 approval_instance_id IS NULL 守卫,使三个 入口一致拒绝已关联审批实例的申请;重提按尝试模式重写(仅已拒绝/已退回/原路失败且无异常)。 - 权益时点:企微通过事务写退款终态、按方式确定的订单态、钱包回款、员工账单冲销与可靠 失效事实;套餐失效/接续/停机仍由既有可靠机制最终一致执行,不把外部调用放入资金事务。 订单支付状态按方式置位:凭证退款与退回原钱包在企微通过时置已退款,原路须渠道明确成功。 - 按官方契约实现微信直连 v3、微信 v2(双向证书)、富友(/commonRefund 与 /refundQuery)、 支付宝四类原路退款;能力只由服务商类型与退款必需凭证完整性决定,无人工开关。 渠道请求号在提交时冻结到尝试记录,并以 channel_submitted_at 条件认领保证资金动作至多 提交一次(重复投递只查询不二次提交);不向任何渠道传递退款结果通知地址。 - 新增 refund:channel:recovery 恢复任务只查询回填;本地查询窗口超期(富友 72 小时、 微信 v2 7 天)转原路退款失败、渠道状态已失败、分类超时未知并置异常转人工,不放行自动 重提以避免重复退款。 - 同步退款 DTO/导出/审计资源与审计查询关联、商户凭证文档,并修正 fuiou 集成契约文档。 迁移 000218(退款尝试与渠道退款事实)、000219(微信 v2 客户端证书凭证)成对提供, 未修改既有迁移;测试库 junhong_cmp_test 完成 up/down/up 与行为核对,未调用真实渠道。
This commit is contained in:
@@ -87,31 +87,33 @@ func (s *Service) Create(ctx context.Context, req *dto.CreateWechatConfigRequest
|
||||
}
|
||||
|
||||
config := &model.WechatConfig{
|
||||
Name: req.Name,
|
||||
Description: desc,
|
||||
ProviderType: req.ProviderType,
|
||||
IsActive: false,
|
||||
OaAppID: req.OaAppID,
|
||||
OaAppSecret: req.OaAppSecret,
|
||||
OaToken: req.OaToken,
|
||||
OaAesKey: req.OaAesKey,
|
||||
OaOAuthRedirectURL: req.OaOAuthRedirectURL,
|
||||
MiniappAppID: req.MiniappAppID,
|
||||
MiniappAppSecret: req.MiniappAppSecret,
|
||||
WxMchID: req.WxMchID,
|
||||
WxAPIV3Key: req.WxAPIV3Key,
|
||||
WxAPIV2Key: req.WxAPIV2Key,
|
||||
WxCertContent: req.WxCertContent,
|
||||
WxKeyContent: req.WxKeyContent,
|
||||
WxSerialNo: req.WxSerialNo,
|
||||
WxNotifyURL: req.WxNotifyURL,
|
||||
FyInsCd: req.FyInsCd,
|
||||
FyMchntCd: req.FyMchntCd,
|
||||
FyTermID: req.FyTermID,
|
||||
FyPrivateKey: req.FyPrivateKey,
|
||||
FyPublicKey: req.FyPublicKey,
|
||||
FyAPIURL: req.FyAPIURL,
|
||||
FyNotifyURL: req.FyNotifyURL,
|
||||
Name: req.Name,
|
||||
Description: desc,
|
||||
ProviderType: req.ProviderType,
|
||||
IsActive: false,
|
||||
OaAppID: req.OaAppID,
|
||||
OaAppSecret: req.OaAppSecret,
|
||||
OaToken: req.OaToken,
|
||||
OaAesKey: req.OaAesKey,
|
||||
OaOAuthRedirectURL: req.OaOAuthRedirectURL,
|
||||
MiniappAppID: req.MiniappAppID,
|
||||
MiniappAppSecret: req.MiniappAppSecret,
|
||||
WxMchID: req.WxMchID,
|
||||
WxAPIV3Key: req.WxAPIV3Key,
|
||||
WxAPIV2Key: req.WxAPIV2Key,
|
||||
WxCertContent: req.WxCertContent,
|
||||
WxKeyContent: req.WxKeyContent,
|
||||
WxSerialNo: req.WxSerialNo,
|
||||
WxNotifyURL: req.WxNotifyURL,
|
||||
WxClientCertContent: req.WxClientCertContent,
|
||||
WxClientKeyContent: req.WxClientKeyContent,
|
||||
FyInsCd: req.FyInsCd,
|
||||
FyMchntCd: req.FyMchntCd,
|
||||
FyTermID: req.FyTermID,
|
||||
FyPrivateKey: req.FyPrivateKey,
|
||||
FyPublicKey: req.FyPublicKey,
|
||||
FyAPIURL: req.FyAPIURL,
|
||||
FyNotifyURL: req.FyNotifyURL,
|
||||
|
||||
AliAppID: req.AliAppID,
|
||||
AliPrivateKey: req.AliPrivateKey,
|
||||
@@ -233,6 +235,8 @@ func (s *Service) Update(ctx context.Context, id uint, req *dto.UpdateWechatConf
|
||||
s.mergeSensitiveField(&config.WxKeyContent, req.WxKeyContent)
|
||||
s.mergeStringField(&config.WxSerialNo, req.WxSerialNo)
|
||||
s.mergeStringField(&config.WxNotifyURL, req.WxNotifyURL)
|
||||
s.mergeSensitiveField(&config.WxClientCertContent, req.WxClientCertContent)
|
||||
s.mergeSensitiveField(&config.WxClientKeyContent, req.WxClientKeyContent)
|
||||
|
||||
// 富友支付
|
||||
s.mergeStringField(&config.FyInsCd, req.FyInsCd)
|
||||
|
||||
Reference in New Issue
Block a user