feat: H5 沉默期延期微信支付改为微信内直接拉起(JSAPI)
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
- H5 下单带 app_type 且选微信、商户为微信直连时,复用套餐购买的 JSAPI 预下单,返回 pay_config - 调起参数保存在支付单,延期订单详情可继续支付;查单、回调、超时关单、作废沿用原流程 - 后台生成二维码、支付宝、富友商户保持原方式
This commit is contained in:
@@ -159,6 +159,7 @@ type SilenceOnlineOrderRequest struct {
|
||||
PackageUsageID uint `json:"package_usage_id" validate:"required,min=1" required:"true" description:"套餐记录 ID"`
|
||||
Days int `json:"days" validate:"required,min=1,max=3650" required:"true" description:"输入的延期天数"`
|
||||
PaymentMethod string `json:"payment_method" validate:"required,oneof=wechat alipay" required:"true" description:"支付方式:wechat / alipay(经商户池路由)"`
|
||||
AppType string `json:"app_type" validate:"omitempty,oneof=official_account miniapp" description:"H5 微信支付时的应用类型:official_account / miniapp;传入时在微信内直接拉起支付(JSAPI),返回 pay_config"`
|
||||
RequestID string `json:"request_id" validate:"required,min=1,max=64" required:"true" description:"下单幂等键"`
|
||||
EvidenceRefs []string `json:"evidence_refs" validate:"omitempty,max=10,dive,max=500" description:"客户申请记录或截图对象存储 Key(后台创建时填写)"`
|
||||
}
|
||||
@@ -178,51 +179,52 @@ type SilenceOfflineOrderRequest struct {
|
||||
|
||||
// SilenceExtensionOrderResponse 延期订单。
|
||||
type SilenceExtensionOrderResponse struct {
|
||||
ID uint `json:"id" description:"订单 ID"`
|
||||
OrderNo string `json:"order_no" description:"订单号"`
|
||||
BatchNo string `json:"batch_no,omitempty" description:"批次号"`
|
||||
PackageUsageID uint `json:"package_usage_id" description:"套餐记录 ID"`
|
||||
PackageID uint `json:"package_id" description:"套餐 ID"`
|
||||
PackageName string `json:"package_name" description:"套餐名称快照"`
|
||||
AssetType string `json:"asset_type" description:"资产类型 iot_card / device"`
|
||||
AssetID uint `json:"asset_id" description:"资产 ID"`
|
||||
AssetIdentifier string `json:"asset_identifier" description:"资产标识快照"`
|
||||
ShopID uint `json:"shop_id" description:"下单时资产所属店铺"`
|
||||
CustomerID *uint `json:"customer_id,omitempty" description:"H5 下单的客户"`
|
||||
Source string `json:"source" description:"来源:client / admin / offline"`
|
||||
SourceName string `json:"source_name" description:"来源名称"`
|
||||
InputDays int `json:"input_days" description:"输入天数"`
|
||||
Months int `json:"months" description:"计费月数"`
|
||||
ExtensionDays int `json:"extension_days" description:"计费 / 延长天数"`
|
||||
UnitPrice int64 `json:"unit_price" description:"单价(分/月)"`
|
||||
Amount int64 `json:"amount" description:"应付金额(分)"`
|
||||
PolicyName string `json:"policy_name" description:"政策名称快照"`
|
||||
BeforeDeadlineAt time.Time `json:"before_deadline_at" description:"下单时截止时间"`
|
||||
ExpectedDeadlineAt time.Time `json:"expected_deadline_at" description:"预计新截止时间"`
|
||||
Status string `json:"status" description:"状态:pending_payment/pending_approval/rejected/paid/completed/closed/exception/refunded"`
|
||||
StatusName string `json:"status_name" description:"状态名称"`
|
||||
PaymentMethod string `json:"payment_method" description:"支付方式:wechat/alipay/offline"`
|
||||
PaymentMerchantName string `json:"payment_merchant_name,omitempty" description:"收款商户名称(取已支付或已退款支付单快照)"`
|
||||
ThirdPartyTradeNo string `json:"third_party_trade_no,omitempty" description:"交易流水号"`
|
||||
PaymentNo string `json:"payment_no,omitempty" description:"支付单号"`
|
||||
QRContent string `json:"qr_content,omitempty" description:"支付内容(待支付时返回,前端渲染为二维码或跳转链接)"`
|
||||
OfflinePaymentMethodName string `json:"offline_payment_method_name,omitempty" description:"线下收款方式"`
|
||||
OfflineTradeNo string `json:"offline_trade_no,omitempty" description:"线下交易单号"`
|
||||
PaymentVoucherKeys []string `json:"payment_voucher_keys,omitempty" description:"线下收款凭证"`
|
||||
EvidenceRefs []string `json:"evidence_refs,omitempty" description:"申请依据"`
|
||||
ApprovalRequired bool `json:"approval_required" description:"是否需要审批"`
|
||||
ApprovalInstanceID *uint `json:"approval_instance_id,omitempty" description:"审批实例 ID"`
|
||||
PaidAmount *int64 `json:"paid_amount,omitempty" description:"实付金额(分)"`
|
||||
PaidAt *time.Time `json:"paid_at,omitempty" description:"支付时间"`
|
||||
ExpireAt *time.Time `json:"expire_at,omitempty" description:"支付截止时间"`
|
||||
CompletedAt *time.Time `json:"completed_at,omitempty" description:"延期生效时间"`
|
||||
ExceptionCode string `json:"exception_code,omitempty" description:"异常原因码"`
|
||||
ExceptionSummary string `json:"exception_summary,omitempty" description:"异常说明"`
|
||||
RefundNo string `json:"refund_no,omitempty" description:"原路退款单号(仅执行异常)"`
|
||||
RefundAmount *int64 `json:"refund_amount,omitempty" description:"退款金额"`
|
||||
RefundedAt *time.Time `json:"refunded_at,omitempty" description:"退款时间"`
|
||||
CreatedBy *uint `json:"created_by,omitempty" description:"后台创建人"`
|
||||
CreatedAt time.Time `json:"created_at" description:"创建时间"`
|
||||
ID uint `json:"id" description:"订单 ID"`
|
||||
OrderNo string `json:"order_no" description:"订单号"`
|
||||
BatchNo string `json:"batch_no,omitempty" description:"批次号"`
|
||||
PackageUsageID uint `json:"package_usage_id" description:"套餐记录 ID"`
|
||||
PackageID uint `json:"package_id" description:"套餐 ID"`
|
||||
PackageName string `json:"package_name" description:"套餐名称快照"`
|
||||
AssetType string `json:"asset_type" description:"资产类型 iot_card / device"`
|
||||
AssetID uint `json:"asset_id" description:"资产 ID"`
|
||||
AssetIdentifier string `json:"asset_identifier" description:"资产标识快照"`
|
||||
ShopID uint `json:"shop_id" description:"下单时资产所属店铺"`
|
||||
CustomerID *uint `json:"customer_id,omitempty" description:"H5 下单的客户"`
|
||||
Source string `json:"source" description:"来源:client / admin / offline"`
|
||||
SourceName string `json:"source_name" description:"来源名称"`
|
||||
InputDays int `json:"input_days" description:"输入天数"`
|
||||
Months int `json:"months" description:"计费月数"`
|
||||
ExtensionDays int `json:"extension_days" description:"计费 / 延长天数"`
|
||||
UnitPrice int64 `json:"unit_price" description:"单价(分/月)"`
|
||||
Amount int64 `json:"amount" description:"应付金额(分)"`
|
||||
PolicyName string `json:"policy_name" description:"政策名称快照"`
|
||||
BeforeDeadlineAt time.Time `json:"before_deadline_at" description:"下单时截止时间"`
|
||||
ExpectedDeadlineAt time.Time `json:"expected_deadline_at" description:"预计新截止时间"`
|
||||
Status string `json:"status" description:"状态:pending_payment/pending_approval/rejected/paid/completed/closed/exception/refunded"`
|
||||
StatusName string `json:"status_name" description:"状态名称"`
|
||||
PaymentMethod string `json:"payment_method" description:"支付方式:wechat/alipay/offline"`
|
||||
PaymentMerchantName string `json:"payment_merchant_name,omitempty" description:"收款商户名称(取已支付或已退款支付单快照)"`
|
||||
ThirdPartyTradeNo string `json:"third_party_trade_no,omitempty" description:"交易流水号"`
|
||||
PaymentNo string `json:"payment_no,omitempty" description:"支付单号"`
|
||||
QRContent string `json:"qr_content,omitempty" description:"支付内容(待支付时返回,前端渲染为二维码或跳转链接)"`
|
||||
PayConfig *ClientPayConfig `json:"pay_config,omitempty" description:"微信内直接支付(JSAPI)参数,H5 带 app_type 下微信单时返回,前端用它拉起支付"`
|
||||
OfflinePaymentMethodName string `json:"offline_payment_method_name,omitempty" description:"线下收款方式"`
|
||||
OfflineTradeNo string `json:"offline_trade_no,omitempty" description:"线下交易单号"`
|
||||
PaymentVoucherKeys []string `json:"payment_voucher_keys,omitempty" description:"线下收款凭证"`
|
||||
EvidenceRefs []string `json:"evidence_refs,omitempty" description:"申请依据"`
|
||||
ApprovalRequired bool `json:"approval_required" description:"是否需要审批"`
|
||||
ApprovalInstanceID *uint `json:"approval_instance_id,omitempty" description:"审批实例 ID"`
|
||||
PaidAmount *int64 `json:"paid_amount,omitempty" description:"实付金额(分)"`
|
||||
PaidAt *time.Time `json:"paid_at,omitempty" description:"支付时间"`
|
||||
ExpireAt *time.Time `json:"expire_at,omitempty" description:"支付截止时间"`
|
||||
CompletedAt *time.Time `json:"completed_at,omitempty" description:"延期生效时间"`
|
||||
ExceptionCode string `json:"exception_code,omitempty" description:"异常原因码"`
|
||||
ExceptionSummary string `json:"exception_summary,omitempty" description:"异常说明"`
|
||||
RefundNo string `json:"refund_no,omitempty" description:"原路退款单号(仅执行异常)"`
|
||||
RefundAmount *int64 `json:"refund_amount,omitempty" description:"退款金额"`
|
||||
RefundedAt *time.Time `json:"refunded_at,omitempty" description:"退款时间"`
|
||||
CreatedBy *uint `json:"created_by,omitempty" description:"后台创建人"`
|
||||
CreatedAt time.Time `json:"created_at" description:"创建时间"`
|
||||
}
|
||||
|
||||
// SilenceSpecialItem 特殊延期的一条明细。
|
||||
|
||||
Reference in New Issue
Block a user