ll_pay 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e236f7da1a930ed85d277e0f1f362692dc160b
-  data.tar.gz: 99a6988e4104fcf65f24b5d123930dbc630a2b48
+  metadata.gz: ac2772f8f1ecafe1006c0452dea64efd64c67f2f
+  data.tar.gz: b6eb1d00781e7773c8036ec885177b2707bc0751
 SHA512:
-  metadata.gz: 4d75e35f538e46466facb3c17fe666b9565298f11e58c3fd91696042e377b15b3b079d6911b3a2f97984958d5812e547b1174a9098d6e82004878fdd1f26a457
-  data.tar.gz: 59dd9313404b78cc79136958422cb14a728b84aa6a93fde30adea77347759ec268b67bbc19c62494c4efcc18875146ec05becb29962eb601f37cafba6fb7bfd1
+  metadata.gz: ab32fa457432eb129c845aa3d06a09ce51482f836410a4399302002e65ca8fbc3f882f8d61d9d5a37be997bf24f8929e6472a601a20571f8a7224967d93804ca
+  data.tar.gz: 1b07b23cf8a733cf637dca50ae66d0b2dc60833015a80bf39aee56e86355085cb2050c09bcce380a8768f036b5950a1c90b0f0b18275a9b90d6c3d0e8e86d5e8

data/lib/ll_pay/notify.rb

@@ -1,6 +1,6 @@
 module LlPay
   module Notify
-    def self.verify?(params, options = {})
+    def notify_verify?(params, options = {})
       params = LlPay::Utils.stringify_keys(params)
       options = LlPay::Utils.stringify_keys(options)
 

data/lib/ll_pay/query_order.rb

@@ -4,31 +4,11 @@ require 'http' # https://github.com/httprb/http
 
 module LlPay
   module QueryOrder
-    def self.query_single_order(sign_type, no_order, dt_order)
-      query_order_hash = { oid_partner: LlPay.oid_partner, dt_order: dt_order, no_order: no_order }
+    def query_single_order(sign_type, no_order, dt_order)
+      query_order_hash = { oid_partner: LlPay.oid_partner, dt_order: dt_order, no_order: no_order, sign_type: sign_type }
+      query_order_hash[:sign] = LlPay::Sign.generate(query_order_hash)
 
-      if sign_type == 'RSA'
-        query_order_hash[:sign_type] = 'RSA'
-        query_order_hash[:sign] = LlPay::Sign::RSA.sign(LlPay.rsa_pri_key, LlPay::Sign.params_to_string(query_order_hash))
-      else
-        query_order_hash[:sign_type] = 'MD5'
-        query_order_hash[:sign] = LlPay::Sign::MD5.sign(LlPay.md5_key, LlPay::Sign.params_to_string(query_order_hash))
-      end
-
-      http_response = HTTP.post('https://yintong.com.cn/queryapi/orderquery.htm',
-                                json: query_order_hash)
-
-      response_hash = JSON.parse(http_response.body.to_s)
-
-      if http_response.code == 200
-        if response_hash['ret_code'] == 0000 && LlPay::Sign.verify?(LlPay::Sign.params_to_string(response_hash))
-          return response_hash
-        else
-          return response_hash
-        end
-      else
-        return
-      end
+      request(:post, 'https://yintong.com.cn/queryapi/orderquery.htm', query_order_hash)
     end
   end
 end

data/lib/ll_pay/refund_order.rb

@@ -0,0 +1,43 @@
+module LlPay
+  module RefundOrder
+    def refund_order(params)
+      params = LlPay::Utils.stringify_keys(params)
+
+      params[:sign_type] = params[:sign_type] || LlPay.sign_type
+      params[:oid_partner] = LlPay.oid_partner
+
+      sign_params = { 'oid_partner' => params[:oid_partner],
+                      'sign_type' => params[:sign_type],
+                      'no_refund' => params[:no_refund],
+                      'dt_refund' => params[:dt_refund],
+                      'money_refund' => params[:money_refund],
+                      'no_order' => params[:no_order],
+                      'dt_order' => params[:dt_order],
+                      'oid_paybill' => params[:oid_paybill],
+                      'notify_url' => params[:notify_url]
+                    }
+
+      params[:sign] = LlPay::Sign.generate(sign_params)
+
+      request(:post, 'https://yintong.com.cn/traderapi/refund.htm', params)
+    end
+
+    def refund_order_query(params)
+      params = LlPay::Utils.stringify_keys(params)
+
+      params[:sign_type] = params[:sign_type] || LlPay.sign_type
+      params[:oid_partner] = LlPay.oid_partner
+
+      sign_params = { 'oid_partner' => params[:oid_partner],
+                      'sign_type' => params[:sign_type],
+                      'no_refund' => params[:no_refund],
+                      'dt_refund' => params[:dt_refund],
+                      'oid_refundno' => params[:oid_refundno]
+                    }
+
+      params[:sign] = LlPay::Sign.generate(sign_params)
+
+      request(:post, 'https://queryapi.lianlianpay.com/refundquery.htm', params)
+    end
+  end
+end

data/lib/ll_pay/service.rb

@@ -4,13 +4,13 @@ module LlPay
   module Service
 
     SECURITY_PAY_REQUIRED_PARAMS = %w(busi_partner dt_order info_order money_order name_goods no_order notify_url oid_partner risk_item sign_type valid_order)
-    def self.securitypay_pay_json(params, options = {})
+    def securitypay_pay_json(params, options = {})
       # params = LlPay::Utils.stringify_keys(params)
       # options = LlPay::Utils.stringify_keys(options)
 
       check_required_params(params, SECURITY_PAY_REQUIRED_PARAMS)
 
-      params['sign_type'] = options['sign_type'] || LlPay.sign_type
+      params['sign_type'] = params['sign_type'] || LlPay.sign_type
 
       params = { 'oid_partner' => LlPay.oid_partner }.merge(params)
 
@@ -30,7 +30,7 @@ module LlPay
       params.to_json
     end
 
-    def self.check_required_params(params, names)
+    def check_required_params(params, names)
       names.each do |name|
         warn("ll_pay Warn: missing required option: #{name}") unless params.has_key?(name)
       end

data/lib/ll_pay/version.rb

@@ -1,3 +1,3 @@
 module LlPay
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/ll_pay.rb

@@ -4,6 +4,7 @@ require 'll_pay/sign/md5'
 require 'll_pay/sign/rsa'
 require 'll_pay/notify'
 require 'll_pay/query_order'
+require 'll_pay/refund_order'
 require 'll_pay/service'
 require 'll_pay/utils'
 
@@ -24,5 +25,32 @@ kPE0FtaoMP3gYfh+OwI+fIRrpW3ySn3mScnc6Z700nU/VYrRkfcSCbSnRwIDAQAB
     attr_accessor :rsa_pri_key # 私钥
     attr_accessor :md5_key     # md5
     attr_accessor :sign_type
+
+    include QueryOrder
+    include RefundOrder
+    include Service
+    include Notify
+  end
+
+  def self.request(verb, url, params = {})
+    case verb.to_sym
+    when :post
+      @http_response = HTTP.post(url, json: params)
+    when :get
+      @http_response = HTTP.get(url)
+    end
+    response_hash = JSON.parse(@http_response.body.to_s)
+
+    if @http_response.code == 200
+      if response_hash['ret_code'] == 0000
+        if LlPay::Sign.verify?(response_hash)
+          return response_hash
+        else
+          return { ret_msg: '签名验证错误' }
+        end
+      else
+        return response_hash
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ll_pay
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - houdelin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -72,7 +72,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-description: Helping rubyist integration with lianlian pay easier.
+description: Helping rubyist integration with lianlian pay(lianlianpay llpay) easier.
 email:
 - houdelin@bayekeji.com
 executables: []
@@ -88,6 +88,7 @@ files:
 - lib/ll_pay.rb
 - lib/ll_pay/notify.rb
 - lib/ll_pay/query_order.rb
+- lib/ll_pay/refund_order.rb
 - lib/ll_pay/service.rb
 - lib/ll_pay/sign.rb
 - lib/ll_pay/sign/md5.rb