Merge pull request #23 from yuc-zhu/master

修复多账号情况下生成 appkey bug

Merge pull request #23 from yuc-zhu/master
修复多账号情况下生成 appkey bug
Jun Jiang
2 parents 4fe3eed2 ab6304cd
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
lib/wx_pay/service.rb
@@ -10,6 +10,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
  
@@ -27,6 +28,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         partnerid: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         package: 'Sign=WXPay',
         timestamp: Time.now.to_i.to_s
       }.merge(params)
...	...	@@ -10,6 +10,7 @@ module WxPay
10	10	params = {
11	11	appid: options.delete(:appid) \|\| WxPay.appid,
12	12	mch_id: options.delete(:mch_id) \|\| WxPay.mch_id,
	13	+ key: options.delete(:key) \|\| WxPay.key,
13	14	nonce_str: SecureRandom.uuid.tr('-', '')
14	15	}.merge(params)
15	16
...	...	@@ -27,6 +28,7 @@ module WxPay
27	28	params = {
28	29	appid: options.delete(:appid) \|\| WxPay.appid,
29	30	partnerid: options.delete(:mch_id) \|\| WxPay.mch_id,
	31	+ key: options.delete(:key) \|\| WxPay.key,
30	32	package: 'Sign=WXPay',
31	33	timestamp: Time.now.to_i.to_s
32	34	}.merge(params)
...	...