csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

task: 完成支付宝C端入口

Browse Source 
新增支付宝支付方式支持：
- DTO：ClientPaymentLink、ClientPayOrderRequest/Response 增加 alipay；ClientCreateOrderRequest 增加 payment_method；ClientCreateOrderResponse 增加 payment_link；ClientCreateRechargeRequest 允许 alipay，app_type 改为微信必填；ClientRechargeResponse PayConfig 改为可选指针，增加 payment_link
- Service（client_order）：PayOrder 新增 alipay 分支（不需要 app_type/OpenID，复用或新建 pending payment，生成 WAP URL）；CreateOrder 强充路径按 payment_method 分支，alipay 不需要 app_type/OpenID；幂等命中时支付宝强充返回同一充值单对应的 payment_link；新增 getOrBuildAlipayPaymentLink（过期 payment 自动续建）；新增 createAlipayForceRechargeOrder（事务创建充值单+支付单，WAP URL 生成失败则标记 failed）
- Handler（client_wallet）：CreateRecharge 移除微信唯一限制，按 payment_method 分发到 createWechatRecharge / createAlipayRecharge；alipay 分支事务内创建充值单+支付单，然后生成 WAP URL，失败标记 payment failed
- 依赖 worker-1 共享 API：pkg/alipay.BuildWapPayURL/CalcExpireAt、Payment.ExpireAt、WechatConfig.AliReturnURL/AliPayExpireMinutes、PaymentStore.FindLatestPendingByOrderAndMethod；本 worktree 暂不能独立构建，待 leader 集成

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
huang
2026-05-22 12:18:11 +08:00
parent 53e95751b1
commit 56adc30409
4 changed files with 398 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/model/dto/client_wallet_dto.go
View File

@@ -77,15 +77,17 @@ type ClientRechargeCheckResponse struct {
// ClientCreateRechargeRequest C4 创建充值订单请求
type ClientCreateRechargeRequest struct {
Identifier string `json:"identifier" validate:"required,min=1,max=50" required:"true" minLength:"1" maxLength:"50" description:"资产标识符（SN/IMEI/虚拟号/ICCID/MSISDN）"`
Amount int64 `json:"amount" validate:"required,min=100,max=10000000" required:"true" minimum:"100" maximum:"10000000" description:"充值金额（分）"`
PaymentMethod string `json:"payment_method" validate:"required,oneof=wechat" required:"true" description:"支付方式 (wechat:微信支付)"`
AppType string `json:"app_type" validate:"required,oneof=official_account miniapp" required:"true" description:"应用类型 (official_account:公众号, miniapp:小程序)"`
Amount int64 `json:"amount" validate:"required,min=1,max=10000000" required:"true" minimum:"1" maximum:"10000000" description:"充值金额（分）"`
PaymentMethod string `json:"payment_method" validate:"required,oneof=wechat alipay" required:"true" description:"支付方式 (wechat:微信支付, alipay:支付宝)"`
// AppType 仅 payment_method=wechat 时必填，alipay 无需传
AppType string `json:"app_type" validate:"omitempty,oneof=official_account miniapp" description:"应用类型（微信支付必传）(official_account:公众号, miniapp:小程序)"`
}
// ClientRechargeResponse C4 创建充值订单响应
type ClientRechargeResponse struct {
Recharge ClientRechargeResult `json:"recharge" description:"充值信息"`
PayConfig ClientRechargePayConfig `json:"pay_config" description:"支付配置"`
Recharge ClientRechargeResult `json:"recharge" description:"充值信息"`
PayConfig *ClientRechargePayConfig `json:"pay_config,omitempty" description:"微信支付配置（payment_method=wechat 时返回）"`
PaymentLink *ClientPaymentLink `json:"payment_link,omitempty" description:"支付宝支付链接（payment_method=alipay 时返回）"`
}
// ClientRechargeResult C4 充值信息