move check_required_options to func start

goofansu
1 parent 7887f036
Showing 1 changed file with 4 additions and 5 deletions Show diff stats
lib/wx_pay/service.rb
@@ -60,18 +60,17 @@ module WxPay
  
     GENERATE_JS_PAY_REQ_REQUIRED_FIELDS = [:prepayid, :noncestr]
     def self.generate_js_pay_req(params, options = {})
+      check_required_options(params, GENERATE_JS_PAY_REQ_REQUIRED_FIELDS)
+
       params = {
         appId: options.delete(:appid) || WxPay.appid,
-        package: "prepay_id=#{params[:prepayid]}",
-        nonceStr: params[:noncestr],
+        package: "prepay_id=#{params.delete(:prepayid)}",
+        nonceStr: params.delete(:noncestr),
         timeStamp: Time.now.to_i.to_s,
         signType: 'MD5'
       }.merge(params)
  
-      check_required_options(params, GENERATE_JS_PAY_REQ_REQUIRED_FIELDS)
-
       params[:paySign] = WxPay::Sign.generate(params)
-
       params
     end
...	...	@@ -60,18 +60,17 @@ module WxPay
60	60
61	61	GENERATE_JS_PAY_REQ_REQUIRED_FIELDS = [:prepayid, :noncestr]
62	62	def self.generate_js_pay_req(params, options = {})
	63	+ check_required_options(params, GENERATE_JS_PAY_REQ_REQUIRED_FIELDS)
	64	+
63	65	params = {
64	66	appId: options.delete(:appid) \|\| WxPay.appid,
65		- package: "prepay_id=#{params[:prepayid]}",
66		- nonceStr: params[:noncestr],
	67	+ package: "prepay_id=#{params.delete(:prepayid)}",
	68	+ nonceStr: params.delete(:noncestr),
67	69	timeStamp: Time.now.to_i.to_s,
68	70	signType: 'MD5'
69	71	}.merge(params)
70	72
71		- check_required_options(params, GENERATE_JS_PAY_REQ_REQUIRED_FIELDS)
72		-
73	73	params[:paySign] = WxPay::Sign.generate(params)
74		-
75	74	params
76	75	end
77	76
...	...