From 9294950ab51b0af965f889d4f86714c5bcb7fe93 Mon Sep 17 00:00:00 2001
From: youkjw <445142575@qq.com>
Date: Mon, 13 Sep 2021 18:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E4=BC=A0sign=5Ftype?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4request=20sign=5Ftype=E6=97=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E7=9A=84bug=20(#480)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 接入关闭订单

* test

* 删除testing,过不了ci

* 避免err覆盖

* 修复不传sign_type导致request sign_type无默认值的bug

* 修复不传sign_type导致request sign_type无默认值的bug

Co-authored-by: liujianwei <liujianwei@linghit.com>
---
 pay/order/pay.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pay/order/pay.go b/pay/order/pay.go
index 06319dc..1abd628 100644
--- a/pay/order/pay.go
+++ b/pay/order/pay.go
@@ -216,6 +216,11 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 		p.NotifyURL = o.NotifyURL // 默认使用order.NotifyURL
 	}
 
+	// 签名类型
+	if p.SignType == "" {
+		p.SignType = util.SignTypeMD5
+	}
+
 	param := map[string]string{
 		"appid":            o.AppID,
 		"body":             p.Body,
@@ -232,10 +237,6 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 		"goods_tag":        p.GoodsTag,
 		"notify_url":       p.NotifyURL,
 	}
-	// 签名类型
-	if param["sign_type"] == "" {
-		param["sign_type"] = util.SignTypeMD5
-	}
 
 	if p.TimeExpire != "" {
 		// 如果有传入交易结束时间