fix(payment): 修正扫呗签名并自动查询支付结果
This commit is contained in:
@@ -160,7 +160,7 @@ func (c *Client) CreatePayment(ctx context.Context, req CreatePaymentRequest) (*
|
||||
"terminal_trace": req.ThirdOrderID,
|
||||
"terminal_time": now.Format("20060102150405"),
|
||||
"total_fee": strconv.FormatInt(req.AmountCent, 10),
|
||||
"order_body": sanitizeText(req.Body, 128),
|
||||
"order_body": sanitizeOrderBody(req.Body),
|
||||
"notify_url": firstNonEmpty(req.NotifyURL, c.cfg.NotifyURL),
|
||||
"attach": sanitizeText(req.Attach, 128),
|
||||
"timeout_express": strconv.Itoa(expireSeconds),
|
||||
@@ -175,8 +175,12 @@ func (c *Client) CreatePayment(ctx context.Context, req CreatePaymentRequest) (*
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := c.verifyResponse(raw); err != nil {
|
||||
return nil, err
|
||||
if err := c.verifyResponseOrChannelError(raw); err != nil {
|
||||
return &CreatePaymentResponse{
|
||||
ErrorMessage: responseMessage(raw),
|
||||
Raw: raw,
|
||||
RawRequest: copyMap(params),
|
||||
}, err
|
||||
}
|
||||
return &CreatePaymentResponse{
|
||||
OK: responseOK(raw),
|
||||
@@ -219,7 +223,7 @@ func (c *Client) QueryPayment(ctx context.Context, req QueryPaymentRequest) (*Qu
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := c.verifyResponse(raw); err != nil {
|
||||
if err := c.verifyResponseOrChannelError(raw); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &QueryPaymentResponse{
|
||||
@@ -269,7 +273,7 @@ func (c *Client) CreateRefund(ctx context.Context, req CreateRefundRequest) (*Cr
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := c.verifyResponse(raw); err != nil {
|
||||
if err := c.verifyResponseOrChannelError(raw); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &CreateRefundResponse{
|
||||
@@ -313,7 +317,7 @@ func (c *Client) QueryRefund(ctx context.Context, req QueryRefundRequest) (*Quer
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := c.verifyResponse(raw); err != nil {
|
||||
if err := c.verifyResponseOrChannelError(raw); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &QueryRefundResponse{
|
||||
@@ -468,6 +472,18 @@ func (c *Client) verifyResponse(raw map[string]string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) verifyResponseOrChannelError(raw map[string]string) error {
|
||||
if err := c.verifyResponse(raw); err == nil {
|
||||
return nil
|
||||
}
|
||||
// 扫呗的失败响应通常不带 key_sign。失败响应只会阻断支付或触发退款查询,
|
||||
// 可以安全地保留为业务错误;成功响应仍必须严格验签。
|
||||
if responseCode(raw) != "01" {
|
||||
return nil
|
||||
}
|
||||
return ErrVerifyFailed
|
||||
}
|
||||
|
||||
func responseCode(raw map[string]string) string {
|
||||
return strings.TrimSpace(raw["return_code"])
|
||||
}
|
||||
@@ -573,6 +589,22 @@ func sanitizeText(value string, max int) string {
|
||||
return value
|
||||
}
|
||||
|
||||
func sanitizeOrderBody(value string) string {
|
||||
value = strings.Join(strings.Fields(value), "-")
|
||||
value = strings.NewReplacer(
|
||||
"+", "-",
|
||||
"/", "-",
|
||||
"?", "",
|
||||
"%", "",
|
||||
"#", "",
|
||||
"&", "",
|
||||
"=", "",
|
||||
"【", "[",
|
||||
"】", "]",
|
||||
).Replace(value)
|
||||
return sanitizeText(value, 128)
|
||||
}
|
||||
|
||||
func firstNonEmpty(values ...string) string {
|
||||
for _, value := range values {
|
||||
if strings.TrimSpace(value) != "" {
|
||||
|
||||
Reference in New Issue
Block a user