reapal 0.2.1 → 0.2.2

data/lib/reapal/form/tender_invest_form.rb

@@ -0,0 +1,62 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Form
+      module TenderInvestForm
+
+        # 3.2 投标（Form）（PC端）
+        #
+        # @param order_no [ String ] 投标订单号
+        # @param tender_no [ String ] 投标的标号
+        # @param amount [ BigDecimal ] 金额
+        # @param coupon_amt [ BigDecimal ] 红包/抵用券
+        # @param busway [ String ] 设备通道 00：PC端；01：手机端；02：Pad端；03：其它
+        # @param return_url [ String ] 回调 URL
+        # @param notify_url [ String ] 通知 URL
+        # @param remark [ String ] 备注
+        #
+        # @return [ Hash ] 结果集
+        #   * form_method [ Hash ]
+        #     * url [ String ]
+        #     * method [ String ]
+        #   * form_data [ Hash ]
+        #     * :merchant_id
+        #     * :encryptkey
+        #     * :data
+        #
+        def find_trade_password(order_no, tender_no, amount, coupon_amt, busway='01', return_url, notify_url, remark)
+          service = 'reapal.trust.tenderInvest'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            order_no: contracts,
+            tender_no: tender_no,
+            amount: amount,
+            coupon_amt: coupon_amt,
+            busway: busway,
+            return_url: return_url,
+            notify_url: notify_url,
+            remark: remark,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          request = Http.get_body(service, params, @config)
+
+          {
+             form_method: {
+              :url => config[:server_url] + post_path,
+              :method => :post,
+            },
+             form_data: {
+              :merchant_id => request[:merchant_id],
+              :encryptkey => request[:encryptkey],
+              :data => request[:data]
+            },
+          }
+        end
+
+      end
+    end
+  end
+end

data/lib/reapal/form/tender_refund_form.rb

@@ -0,0 +1,84 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Form
+      module TenderRefund
+
+        # 3.9 还款(Form)
+        #
+        # @param flow_id [String] 还款订单号
+        # @param tender_no [String] 标的号
+        # @param debit_contrats [String] 借款方协议号
+        # @param debit_detail [JSON] 借款方还款
+        #   *seria_no [String] 还款流水号
+        #   *payee_contracts [String] 收款方协议号
+        #   *amount [String] 金额
+        #   *remark [String] 备注
+        # @param invest_detail [JSON] 投资方分账
+        #   *seria_no [String] 还款分账流水号
+        #   *invest_contracts [String] 投资方协议号
+        #   *payee_contracts [String] 收款方协议号
+        #   *amount [String] 金额
+        #   *remark [String] 备注
+        # @param busway [String] '00'：PC端；'01'：手机端(默认)；'02'：Pad端；'03'：其它
+        # @param return_url [String] 回调 url
+        # @param notify_url [String] 通知 url
+
+
+        # @return [ Hash ] 结果集
+        #   * form_method
+        #     * url
+        #     * method
+        #   * form_data
+        #     * :merchant_id
+        #     * :encryptkeyÍ
+        #     * :data
+        #
+        def tender_refund_form(flow_id, tender_no, debit_contrats, debit_detail,
+                               invest_details, busway='01', return_url, notify_url )
+
+          service = 'reapal.trust.tenderRefund'
+          post_path = '/reagw/tender/rest.htm'
+
+          debit_details[:serialNo] = debit_detail[:seria_no]
+          debit_details[:payeeContracts] = debit_detail[:payee_contracts]
+          debit_details[:amount] = debit_detail[:amount]
+          debit_details[:remark] = debit_detail[:remark]
+
+          invest_details[:seriaNo] = invest_detail[:seria_no]
+          invest_details[:investContracts] = invest_detail[:invest_contracts]
+          invest_details[:payeeContracts] = invest_detail[:payee_contracts]
+          invest_details[:amount] = invest_detail[:amount]
+          invest_details[:mark] = invest_detail[:mark]
+
+
+          params = {
+            orderNo: flow_id,
+            tenderNo: tender_no,
+            debitContracts: debit_contrats,
+            debitDetails: debit_details,
+            investDetails: invest_details,
+            busway: busway,
+            returnUrl: return_url,
+            notifyUrl: notify_url,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
+          }
+
+          request = Http.get_body(service, params, @config)
+
+          {
+             form_method: {
+              :url => config[:server_url] + post_path,
+              :method => :post,
+            },
+             form_data: request
+
+          }
+
+        end
+
+      end #TenderRefund
+    end
+  end
+end

data/lib/reapal/form/withdraw_apply_form.rb

@@ -0,0 +1,54 @@
+# coding: utf-8
+
+module Reapal
+  module Form
+    module WithdrawApplyForm
+
+      # 2.7 提现申请
+      #
+      # @param contract [String] 用户协议
+      # @param flow_id [String] 订单号
+      # @param money [Number] 提现金额，2位小数
+      # @param charge [Number] 手续费，2位小数
+      # @param return_url [String] 回调 url
+      # @param notify_url [String] 通知 url
+      # @param buyway [String] 设备通道，默认手机端。00：PC端；01：手机端；02：Pad端；03：其它
+      #
+      # @return [ Hash ] 结果集
+      #   * :form_method
+      #     * :method
+      #     * :url
+      #   * :form_data
+      #     * :merchant_id
+      #     * :encryptkey
+      #     * :data
+      #
+      def withdraw_apply_form(contract, flow_id, money, charge, return_url, notify_url, busway='01')
+        service = 'reapal.trust.withdrawApply'
+        post_path = '/reagw/service/withdraw.htm'
+
+        params = {
+          orderNo: flow_id,
+          contracts: contract,
+          amount: money,
+          charge: charge,
+          busway: busway,
+          returnUrl: return_url,
+          notifyUrl: notify_url,
+          applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+        }
+
+        form_data = Http.get_body(service, params, @config)
+
+        {
+          form_method: {
+            method: :post,
+            url: config[:server_url] + post_path,
+          },
+          form_data: form_data
+        }
+      end
+
+    end
+  end
+end

data/lib/reapal/http/communicate.rb

@@ -5,20 +5,20 @@ module Reapal
     SIGN_TYPE = '0' # 0 表示 md5
     VERSION = '1.0' # 版本号
 
-    def self.post(service, params, config, post_path)
-      post_body = get_body(service, params, config)
+    def self.post(service, params, config, post_path, version=VERSION)
+      post_body = get_body(service, params, config, version)
       uri = URI(config[:server_url] + post_path)
 
       Reapal.logger.info "[#{service}] 请求内容为：\n#{params}\n"
       Reapal.logger.info "[#{service}(#{uri})] 最终发送内容为：\n#{post_body}\n"
 
-      result = {}
+      result = nil
 
       begin
         response = Net::HTTP.post_form(uri, post_body)
         Reapal.logger.info "[#{service}] 返回的报文为：\n#{response.body}"
 
-        if response.is_a?(Net::HTTPSuccess) # 返回 200 才处理
+        if response.is_a?(Net::HTTPSuccess)
           response_raw_body = unpack_body(response.body, config)
           result = Reapal::Http::Response.new(service: service,
                                               flow_id: params[:orderNo],
@@ -27,18 +27,17 @@ module Reapal
                                               data: response_raw_body[:resData],
                                               data_valid: response_raw_body[:data_valid])
         else
-          # 非 200 请求，结果为 Fail
+          # 不成功的不解密, 500, 300, 400
           result = Reapal::Http::Response.new(service: service,
                                               flow_id: params[:orderNo],
                                               http_response: response,
                                               raw_body: response.body,
                                               data_valid: true)
         end
-      rescue
-        # 请求超时等网络原因，结果为 pending，等待下次查询
+      rescue Net::ReadTimeout
         result = Reapal::Http::Response.new(service: service,
                                             flow_id: params[:orderNo],
-                                            http_response: response,
+                                            http_response: nil,
                                             data_valid: true)
       end
 
@@ -48,9 +47,9 @@ module Reapal
     end
 
     # 表单的 body
-    def self.get_body(service, params, config)
+    def self.get_body(service, params, config, version=VERSION)
       data = {
-        version: VERSION,
+        version: version,
         service: service,
         partner: config[:partner_id],
         sign: Sign::MD5.sign(params.to_json, config[:md5_key]),
@@ -66,24 +65,27 @@ module Reapal
       }
     end
 
-    private
-
-    def self.unpack_body(body_string, config)
-      # 返回是 json 字符串格式
-      body = Utils.symbolize_keys(JSON.parse(body_string))
+    def self.decode_data(encryptkey, data, config)
+      if encryptkey.nil? || data.nil? || encryptkey.empty? || data.empty?
+        return {
+          resData: {
+            errorCode: 'error_decode_params',
+            errorMsg: '解密参数不正确'
+          },
+          data_valid: true,
+        }
+      end
 
       # 1. 拿到用来加密的16位随机字符串
-      random_key = Encrypt::RSA.decrypt(body[:encryptkey],
-                                        config[:private_key])
+      random_key = Encrypt::RSA.decrypt(encryptkey, config[:private_key])
 
       # 2. 用16位随机字符串解密返回的数据
-      data_string = Encrypt::AES.decrypt(body[:data], random_key)
+      data_string = Encrypt::AES.decrypt(data, random_key)
       data = parse_data_string(data_string)
       data[:resData] = Utils.symbolize_keys(JSON.parse(data[:resData]))
 
       # 3. 验签，错误时候 sign 是没有值的
-      if (data[:sign].nil? && data[:resData][:errorCode]) \
-         || (data[:sign] && Sign::MD5.verify?(data[:resData].to_json, config[:md5_key], data[:sign]))
+      if data[:resData][:errorCode] || (data[:sign] && Sign::MD5.verify?(data[:resData].to_json, config[:md5_key], data[:sign]))
         data[:data_valid] = true
       else
         data[:data_valid] = false
@@ -92,6 +94,29 @@ module Reapal
       data
     end
 
+    private
+    
+    def self.unpack_body(body_string, config)
+      begin
+        # 返回是 json 字符串格式
+        body = Utils.symbolize_keys(JSON.parse(body_string))
+      rescue
+        body = {}
+      end
+
+      if body[:encryptkey].nil? || body[:data].nil?
+        return {
+          resData: {
+            errorCode: 'error_decode_params',
+            errorMsg: '解密参数不正确'
+          },
+          data_valid: true,
+        }
+      end
+
+      self.decode_data(body[:encryptkey], body[:data], config)
+    end
+
     # 正确的返回字符串例子：
     #    'version=1.0&service=reapal.trust.onekeyContract&signType=0&sign=cdab41a05d595d6a5f5a818af2b39398&resData={"contracts":"RB1711167FYG9U29","userName":"王五","userIdentity":"330602198711160034","userMobile":"18357101332","orderNo":"5a0d488fe0c016049a000001","resultCode":"0007","processTime":"2017-11-16 16:13:04"}'
     # 

data/lib/reapal/http/response.rb

@@ -13,6 +13,13 @@ module Reapal
         params.each do |key, value|
           instance_variable_set("@#{key}", value)
         end
+
+        self.data = {} if self.data.nil? # 默认一定要有
+
+        unless self.data_valid
+          self.data[:errorCode] = 'sign_valid_fail'
+          self.data[:errorMsg] = '数据签名错误'
+        end
       end
 
       def [] key
@@ -28,6 +35,20 @@ module Reapal
         arr.join("\n")
       end
 
+      def http_success?
+        http_response && http_response.is_a?(Net::HTTPSuccess)        
+      end
+
+      def http_fail?
+        # 而 400 错误一般都是地址不存在或者没有权限，都当成错误处理
+        http_response && http_response.code.to_s == '404'
+      end
+
+      def http_pending?
+        # nil 的时候是超时，非 404 的其他错误都是 pending
+        http_response.nil? || (!http_success? && !http_fail?)
+      end
+
     end
 
   end

data/lib/reapal/utils.rb

@@ -43,5 +43,21 @@ module Reapal
       ((0..9).to_a + ('a'..'z').to_a + ('A'..'Z').to_a).sample(size).join()
     end
 
+    # api 通用返回数据结构
+    # @param request_params [Object] 请求参数
+    # @param response [Object] 响应对象
+    # @return [Object]
+    def self.api_result(request_params, response)
+      {
+        result: 'P', # 默认
+        request_params: request_params,
+        response: response,
+        flow_id: response.nil? ? nil : response.flow_id,
+        error_code: response.nil? ? nil : response.data[:errorCode],
+        error_msg: response.nil? ? nil : response.data[:errorMsg],
+        data: response.nil? ? nil : response.data,
+      }
+    end
+
   end
 end

data/lib/reapal/version.rb

@@ -1,3 +1,3 @@
 module Reapal
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapal
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,17 +124,37 @@ files:
 - bin/console
 - bin/setup
 - lib/reapal.rb
-- lib/reapal/api/trust/balance_query.rb
-- lib/reapal/api/trust/contract_query.rb
-- lib/reapal/api/trust/find_trade_password.rb
-- lib/reapal/api/trust/mobile_modify.rb
-- lib/reapal/api/trust/onekey_batch_contract.rb
-- lib/reapal/api/trust/onekey_contract.rb
-- lib/reapal/api/trust/withdraw_apply.rb
+- lib/reapal/api/asset/tender_all_cancel.rb
+- lib/reapal/api/asset/tender_apply.rb
+- lib/reapal/api/asset/tender_auth_cancel.rb
+- lib/reapal/api/asset/tender_auth_query.rb
+- lib/reapal/api/asset/tender_finish.rb
+- lib/reapal/api/asset/tender_repayment_complete.rb
+- lib/reapal/api/asset/tender_repayment_project.rb
+- lib/reapal/api/error_codes.rb
+- lib/reapal/api/money/.keep
+- lib/reapal/api/order/.keep
+- lib/reapal/api/user/balance_query.rb
+- lib/reapal/api/user/bank_card_add_sms.rb
+- lib/reapal/api/user/bank_card_add_sms_again.rb
+- lib/reapal/api/user/bank_card_add_sms_confirm.rb
+- lib/reapal/api/user/bind_card_query.rb
+- lib/reapal/api/user/contract_query.rb
+- lib/reapal/api/user/mobile_query.rb
+- lib/reapal/api/user/onekey_batch_contract.rb
+- lib/reapal/api/user/onekey_contract.rb
+- lib/reapal/api/user/undo_bind_bank_card.rb
 - lib/reapal/client.rb
 - lib/reapal/encrypt/aes.rb
 - lib/reapal/encrypt/rsa.rb
 - lib/reapal/extensions.rb
+- lib/reapal/form/business_auth_form.rb
+- lib/reapal/form/find_trade_password_form.rb
+- lib/reapal/form/mobile_modify_form.rb
+- lib/reapal/form/signle_tender_transfer_form.rb
+- lib/reapal/form/tender_invest_form.rb
+- lib/reapal/form/tender_refund_form.rb
+- lib/reapal/form/withdraw_apply_form.rb
 - lib/reapal/http/communicate.rb
 - lib/reapal/http/response.rb
 - lib/reapal/railtie.rb