Commit 6bb2b17d441ab5e955c6018553f338e5c79f19d8

Authored by jasl
1 parent 1217d891
Exists in master

use 1.9 syntax

Showing 1 changed file with 9 additions and 9 deletions   Show diff stats
lib/wx_pay/service.rb
@@ -5,7 +5,7 @@ module WxPay @@ -5,7 +5,7 @@ module WxPay
5 module Service 5 module Service
6 GATEWAY_URL = 'https://api.mch.weixin.qq.com' 6 GATEWAY_URL = 'https://api.mch.weixin.qq.com'
7 7
8 - INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = %i(body out_trade_no total_fee spbill_create_ip notify_url trade_type) 8 + INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = [:body, :out_trade_no, :total_fee, :spbill_create_ip, :notify_url, :trade_type]
9 def self.invoke_unifiedorder(params, options = {}) 9 def self.invoke_unifiedorder(params, options = {})
10 params = { 10 params = {
11 appid: options.delete(:appid) || WxPay.appid, 11 appid: options.delete(:appid) || WxPay.appid,
@@ -23,7 +23,7 @@ module WxPay @@ -23,7 +23,7 @@ module WxPay
23 r 23 r
24 end 24 end
25 25
26 - INVOKE_CLOSEORDER_REQUIRED_FIELDS = %i(out_trade_no) 26 + INVOKE_CLOSEORDER_REQUIRED_FIELDS = [:out_trade_no]
27 def self.invoke_closeorder(params, options = {}) 27 def self.invoke_closeorder(params, options = {})
28 params = { 28 params = {
29 appid: options.delete(:appid) || WxPay.appid, 29 appid: options.delete(:appid) || WxPay.appid,
@@ -41,7 +41,7 @@ module WxPay @@ -41,7 +41,7 @@ module WxPay
41 r 41 r
42 end 42 end
43 43
44 - GENERATE_APP_PAY_REQ_REQUIRED_FIELDS = %i(prepayid noncestr) 44 + GENERATE_APP_PAY_REQ_REQUIRED_FIELDS = [:prepayid, :noncestr]
45 def self.generate_app_pay_req(params, options = {}) 45 def self.generate_app_pay_req(params, options = {})
46 params = { 46 params = {
47 appid: options.delete(:appid) || WxPay.appid, 47 appid: options.delete(:appid) || WxPay.appid,
@@ -58,7 +58,7 @@ module WxPay @@ -58,7 +58,7 @@ module WxPay
58 params 58 params
59 end 59 end
60 60
61 - GENERATE_JS_PAY_REQ_REQUIRED_FIELDS = %i(appId nonceStr package) 61 + GENERATE_JS_PAY_REQ_REQUIRED_FIELDS = [:appid, :noncestr, :package]
62 def self.generate_js_pay_req(params, options = {}) 62 def self.generate_js_pay_req(params, options = {})
63 params = { 63 params = {
64 appId: options.delete(:appid) || WxPay.appid, 64 appId: options.delete(:appid) || WxPay.appid,
@@ -73,7 +73,7 @@ module WxPay @@ -73,7 +73,7 @@ module WxPay
73 params 73 params
74 end 74 end
75 75
76 - INVOKE_REFUND_REQUIRED_FIELDS = %i(out_refund_no total_fee refund_fee op_user_id) 76 + INVOKE_REFUND_REQUIRED_FIELDS = [:out_refund_no, :total_fee, :refund_fee, :op_user_id]
77 def self.invoke_refund(params, options = {}) 77 def self.invoke_refund(params, options = {})
78 params = { 78 params = {
79 appid: options.delete(:appid) || WxPay.appid, 79 appid: options.delete(:appid) || WxPay.appid,
@@ -98,7 +98,7 @@ module WxPay @@ -98,7 +98,7 @@ module WxPay
98 r 98 r
99 end 99 end
100 100
101 - INVOKE_TRANSFER_REQUIRED_FIELDS = %i(partner_trade_no openid check_name amount desc spbill_create_ip) 101 + INVOKE_TRANSFER_REQUIRED_FIELDS = [:partner_trade_no, :openid, :check_name, :amount, :desc, :spbill_create_ip]
102 def self.invoke_transfer(params, options = {}) 102 def self.invoke_transfer(params, options = {})
103 params = { 103 params = {
104 mch_appid: options.delete(:appid) || WxPay.appid, 104 mch_appid: options.delete(:appid) || WxPay.appid,
@@ -121,7 +121,7 @@ module WxPay @@ -121,7 +121,7 @@ module WxPay
121 r 121 r
122 end 122 end
123 123
124 - INVOKE_REVERSE_REQUIRED_FIELDS = %i(out_trade_no) 124 + INVOKE_REVERSE_REQUIRED_FIELDS = [:out_trade_no]
125 def self.invoke_reverse(params, options = {}) 125 def self.invoke_reverse(params, options = {})
126 params = { 126 params = {
127 appid: options.delete(:appid) || WxPay.appid, 127 appid: options.delete(:appid) || WxPay.appid,
@@ -144,7 +144,7 @@ module WxPay @@ -144,7 +144,7 @@ module WxPay
144 r 144 r
145 end 145 end
146 146
147 - INVOKE_MICROPAY_REQUIRED_FIELDS = %i(body out_trade_no total_fee spbill_create_ip auth_code) 147 + INVOKE_MICROPAY_REQUIRED_FIELDS = [:body, :out_trade_no, :total_fee, :spbill_create_ip, :auth_code]
148 def self.invoke_micropay(params, options = {}) 148 def self.invoke_micropay(params, options = {})
149 params = { 149 params = {
150 appid: options.delete(:appid) || WxPay.appid, 150 appid: options.delete(:appid) || WxPay.appid,
@@ -167,7 +167,7 @@ module WxPay @@ -167,7 +167,7 @@ module WxPay
167 r 167 r
168 end 168 end
169 169
170 - ORDER_QUERY_REQUIRED_FIELDS = %i(out_trade_no) 170 + ORDER_QUERY_REQUIRED_FIELDS = [:out_trade_no]
171 def self.order_query(params, options = {}) 171 def self.order_query(params, options = {})
172 params = { 172 params = {
173 appid: options.delete(:appid) || WxPay.appid, 173 appid: options.delete(:appid) || WxPay.appid,