eloan 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90ecdeb8bb5691a1297fa622503bc96d1f7af08b45287bd4f1790b2dba8541e7
-  data.tar.gz: 78e417e1ab2452e31996d3db97af638571115c223fed98e0f7f6f7b30559e627
+  metadata.gz: 96f9a439006d13b140af13970bc1278d878b1e40f54139f3c52b2f4a5a8dd31a
+  data.tar.gz: e86d3f4b882a188b59ff00ce342cfd1e1fac1a7c85985af64cf792004be8ef9c
 SHA512:
-  metadata.gz: 190bbf1dabe028f11318f80da8763b9a1e1e27a66cac292cc190f5b38a0fc0a3494c99b497e5974a0d857114137935ad2ec4d5b1ed716f3c758552152ca67132
-  data.tar.gz: 54824364f89172c797eb2400ec4d511464650bf472d1288fb80983b1e11173cede24304f134a78732d34311d706a84476106031d2b05889059d1f676c958116f
+  metadata.gz: 71252e034e803d58fb55f3acb9570d3060c8695ca766ee9d44ee53259613cc672482301cefd009b4eb04239671569a96c7a0006e580c08796d71f54a14f71d29
+  data.tar.gz: 80830baa752c6223cd84eb29b457800570d2dd2bf47e5daf5f7a5995472180d49a809d80ffbdc0906d87dc19d7d400d90fa19bbe8891c0687ea24b53d6272d63

data/examples/example.rb

@@ -20,7 +20,7 @@ data = {
 Eloan.api.pay(101, data)
 
 # 个人开户代扣签约绑卡(102)
-# code = 101
+# code = 102
 # cert_id String  是 最长20  身份证号码
 # user_name String  是 最长80  用户姓名
 # card_no String  是 最长20  银行卡号
@@ -66,12 +66,12 @@ Eloan.api.pay(103, data)
 # user_name String  是 最长80  借款人姓名
 # user_card_no  String  是 最长20  借款人银行卡号
 # user_amount String  是 最长14  借款人金额，小数点后两位数字 #.##
-# user_cash_method  String  是 定长2 取现方式：T0：即时到账，手续费较高；T1：第二日到账，手续费较低, default: T1
+# user_cash_method  String  是 定长2 取现方式：T0：即时到账，手续费较高；T1：第二日到账，手续费较低, default: T0
 # merchant_cert_type  String  否 定长2 受托商户证件类型，受托支付时必填：00-普通营业执照企业； 01-三证合一企业
 # merchant_cert_id  String  否 最长30  受托商户证件号码，受托支付时必填
 # merchant_amount String  否 最长14  受托商户金额，小数点后两位数字#.##，受托支付时必填
 # installment_number  String  是 最长3 分期期数
-# installment_rate  String  是 最长5 分期利率，年化<=36.00%，小数点后两位数字#.##， 如22.22%，传参为：22.22
+# installment_rate  String  是 最长5 分期利率，年化<=36.00%，小数点后两位数字#.##， 如22.22%，传参为：22.22, default: 0.00
 # payment_method  String  是 定长2 还款方式：00-等额本息；01-等额本金；02-一次性还本付息； 03-先息后本(即按频率付息、一次还本)
 # loan_comment  String  否 最长256 备注
 # auditor String  否 最长64  审核人

data/lib/eloan/api.rb

@@ -10,7 +10,6 @@ module Eloan
     include Helper::Payment
     include Helper::Request
 
-
     def pay code, data = {}
       request = request_params(code.to_s)
       url = generate_request_url(request[:url])
@@ -19,7 +18,10 @@ module Eloan
       options = handle_params(generate_default_params.merge(data))
       default_params = request[:default]
       default_params.keys.each{|k| options[k] = default_params[k] if options[k].blank? }
-      options["signature"] = hexdigest(handle_request_data(request_method, url, options))
+      
+      eloan_message = handle_request_data(request_method, url, options)
+      instance_variable_set(:@eloan_message, eloan_message)
+      options["signature"] = hexdigest(eloan_message)
 
       response = execute(request_method, url, options)
     end

data/lib/eloan/client.rb

@@ -10,11 +10,13 @@ module Eloan
       @configurate = config
     end
 
-    def execute(request_method, url, options)
-      response = RestClient::Request.execute(method: request_method, 
-                    url: URI.escape(url), headers: {params: options})
-
-      p raw_response response
+    def execute(method, url, options)
+      if method == 'get'
+        response = RestClient.get(URI.escape(url), options) 
+      else
+        response = RestClient.post(URI.escape(url), options) 
+      end
+      raw_response response
     end
 
   end

data/lib/eloan/configuration.rb

@@ -6,5 +6,9 @@ module Eloan
     def initialize
       @env = 'development'
     end
+
+    def production?
+      env == 'production'
+    end
   end
 end

data/lib/eloan/helper/payment.rb

@@ -1,6 +1,7 @@
 module Eloan
   module Helper
     module Payment
+
       # 生成默认参数
       def generate_default_params
         {
@@ -13,10 +14,9 @@ module Eloan
       end
 
       private
-      # 生成流水
+      # 生成长度为28的流水
       def generate_request_seq
-        length = 6 - configurate.platform.length
-        _ljust = 8 + length 
+        _ljust = 14 - configurate.platform.length
         configurate.platform + Time.now.strftime("%Y%m%d%H%M%S") + rand(1000 * 1000).to_s.rjust(_ljust, '0')
       end
 

data/lib/eloan/helper/request.rb

@@ -8,7 +8,7 @@ module Eloan
             {
               url: '/v1/users/add-cash-card',
               method: 'POST',
-              notity: true,
+              notify: true,
               default: {
                 'cert_type' => '00',
                 'card_type' => 'D',
@@ -19,7 +19,7 @@ module Eloan
             {
               url: '/v1/users/add-withhold-card',
               method: 'POST',
-              notity: true,
+              notify: true,
               default: {
                 'cert_type' => '00',
                 'card_type' => 'D',
@@ -38,7 +38,7 @@ module Eloan
             {
               url: '/v1/trade/loan',
               method: 'POST',
-              notity: true,
+              notify: true,
               default: {
                 'business_type' =>  '00',
                 'product_type' => '00',
@@ -47,9 +47,10 @@ module Eloan
                 'loan_period_type' => '01',
                 'entrusted_flag' => 'N',
                 'user_cert_type' => '00',
-                'user_cash_method' => 'T1',
+                'user_cash_method' => 'T0',
                 'installment_number' => '1',
                 'payment_method' => '02',
+                'installment_rate' => '0.00',
                 'bg_return_url'  => configurate.bg_return_url
               }
             }
@@ -57,7 +58,7 @@ module Eloan
             {
               url: '/v1/trade/repay',
               method: 'POST',
-              notity: true,
+              notify: true,
               default: {
                 'business_type' => '00',
                 'product_type' => '00',
@@ -72,7 +73,7 @@ module Eloan
             {
               url: '/v1/trade/loan/cash',
               method: 'POST',
-              notity: true,
+              notify: true,
               default: {
                 'bg_return_url'  => configurate.bg_return_url
               }

data/lib/eloan/helper/service.rb

@@ -1,6 +1,7 @@
 module Eloan
   module Helper
     module Service
+      attr_accessor :chaxue
       def generate_request_url(url='')
         [default_url, url] * ''
       end
@@ -18,28 +19,30 @@ module Eloan
         if response_code.last(2).to_s == '00'
           status, code, message = 'success', 200, 'success'
         else
-          if request_params(response_code.first(3))[:notify] && response_code.last(2).to_s == '00'
+          if request_params(response_code.first(3))[:notify] && response_code.last(2).to_s == '01'
             status, code, message = 'success', 201, '处理中'
           else
             message = response['bind_error_message'].present? ? response['bind_error_message'] : response['response_message']
             status, code = 'fail', 202
           end
         end
-        {status: status, code: code, message: message, data: response}
+
+        response = {status: status, code: code, message: message, data: response}
+        unless configurate.production?
+          eloan_message = instance_variable_get(:@eloan_message)
+          response = response.merge(eloan_message: eloan_message)
+        end
       end
 
       private
 
       def default_url
-        if production?
+        if configurate.production?
+          p chaxue
         else
           'https://mertest.cloudpnr.com/api/eloan'
         end
       end
-
-      def production?
-        configurate.env == 'production'
-      end
     end
   end
 end

data/lib/eloan/version.rb

@@ -1,3 +1,3 @@
 module Eloan
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eloan
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - rqiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler