reapal 0.2.2 → 0.3.0

data/lib/reapal/api/user/bind_card_query.rb

@@ -18,7 +18,7 @@ module Reapal
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
         #     * :contracts [String] 用户协议号
-        #     * :bank_cards [Array] 银行卡信息数组 
+        #     * :bank_cards [Array] 银行卡信息数组
         #       * :bank_name  银行名称
         #       * :bank_code  银行代码
         #       * :bank_card  银行卡后四位
@@ -40,24 +40,13 @@ module Reapal
             queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
           }
 
-          response = Http.post(service, params, @config, post_path)
+          res = operate_post(:query, service, params, post_path, Http::ErrorCode.bind_card, ['0000'])
 
-          res = Reapal::Utils.api_result(params, response)
-
-          # 查询类 api，http 没成功都返回 pending
-          return res unless response.http_success?
-
-          if Api::ErrorCode.bind_card.include?(response.data[:errorCode])
-            res[:result] = 'F'
-            return res
+          if 'S' == res[:result]
+            # TODO: (tony) 返回的银行字符串解析成数据，便于使用方
+            # res[:data][:bank_cards] = parse_cards_info(res[:data][:bank_cards])
           end
 
-          # 其余 api 错误不知道
-          return res unless response.data[:errorCode].nil?
-
-          res[:result] = 'S'
-          res[:data][:bank_cards] = parse_cards_info(res[:data][:bank_cards])
-
           res
         end
 

data/lib/reapal/api/user/contract_query.rb

@@ -7,12 +7,40 @@ module Reapal
 
         # 1.5 签约查询，支持个人和企业（API）
         #
-        def contract_query(ori_flow_id)
-          # TODO(tony): 目前我们只用个人签约，个人签约都是同步返回，所以先不做实现
-          raise "Not Implement"
+        # @param oneket_com_contract_flow_id [ String ] 签约订单号
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] 业务结果：'S/F/P'
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :error_code [String] 错误代号
+        #   * :error_msg [String] 错误信息
+        #   * :data: 具体业务返回信息
+        #     * :orderNo [String] 签约订单号
+        #     * :contract [String] 企业协议号
+        #     * :result [String] * :resultCode [String] 结果代码 0000：签约成功 0003：待审核
+        #     * :corpName [String] 法人代表姓名
+        #     * :corpIdentity [String] 法人身份证号
+        #     * :comLicense [String] 组织机构代码/社会征信号
+        #     * :licStartDate [String] 企业组织机构证起始日
+        #     * :licEndDate [String] 企业组织机构证截止日
+        #     * :mobile [String] 手机号
+        #     * :email [String] 企业邮箱
+        #     * :remark [String] 备注
+        #
+        def contract_query(oneket_com_contract_flow_id)
+          service = 'reapal.trust.contractQuery'
+          post_path = '/reagw/agreement/agreeApi.htm'
+
+          params = {
+            orderNo: oneket_com_contract_flow_id,
+            queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          operate_post(:query, service, params, post_path, Http::ErrorCode.contract_query, ['0000'])
         end
 
-      end
+      end # module
     end
   end
 end

data/lib/reapal/api/user/mobile_query.rb

@@ -19,8 +19,6 @@ module Reapal
         #     * :contracts [String] 用户协议号
         #     * :mobile [String] 用户手机号
         #
-
-
         def mobile_query(contracts)
           service = 'reapal.trust.mobileQuery'
           post_path = '/reagw/user/restApi.htm'
@@ -30,24 +28,7 @@ module Reapal
             queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          response = Http.post(service, params, @config, post_path)
-
-          res = Reapal::Utils.api_result(params, response)
-
-          if Api::ErrorCode.mobile.include?(response.data[:errorcode])
-            res[:result] = 'F'
-            return res
-          end
-
-          # 查询类 api，http 没成功都返回 pending
-          return res unless response.http_success?
-
-          # 其余 api 错误不知道
-          return res unless response.data[:errorCode].nil?
-
-          res[:result] = "S"
-
-          res
+          operate_post(:query, service, params, post_path, Http::ErrorCode.mobile, ['0000'])
         end
 
       end

data/lib/reapal/api/user/modify_bind_bank_card.rb

@@ -0,0 +1,55 @@
+# coding: utf-8
+module Reapal
+  module Api
+    module User
+      module ModifyBankCardAddSms
+
+        # 1.14 修改绑卡（API）
+        #
+        # @param flow_id [ String ] 订单号
+        # @param contracts [ String ] 用户协议号
+        # @param bank_account_no [ String ] 银行卡账号后四位
+        # @param account_province [ String ] 银行所在省
+        # @param account_city [ String ] 银行所在市
+        # @param branch [ String] 银行分行
+        # @param subbranch [ String ] 银行支行
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] "S"/"F"/"P"
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :error_code [String] 错误代号
+        #   * :error_msg [String] 错误信息
+        #   * :data: 具体业务返回信息
+        #       * :flow_id [ String ]  订单号
+        #       * :result_code [ String ] 结果代码 0000：申请成功
+        #
+        def modify_bank_card_add_sms(flow_id,
+                                     contracts,
+                                     bank_account_no,
+                                     account_province,
+                                     account_city,
+                                     branch,
+                                     subbranch)
+
+          service = 'reapal.trust.modifyBindBankCard'
+          post_path = '/reagw/bankcard/modifyBindBankApi.htm'
+
+          params = {
+            orderNo: flow_id,
+            contracts: contracts,
+            bankAccountNo: bank_account_no,
+            accountProvince: account_province,
+            accountCity: account_city,
+            branch: branch,
+            subbranch: subbranch,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.bind_card, ['0000'])
+        end
+
+      end # module
+    end
+  end
+end

data/lib/reapal/api/user/onekey_batch_contract.rb

@@ -42,21 +42,7 @@ module Reapal
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          response = Http.post(service, params, @config, post_path)
-
-          res = Reapal::Utils.api_result(params, response)
-
-          return res if response.http_pending?
-
-          # 个人签约只有返回码是 '0000', '0007' 才成功
-          if ['0000', '0007'].include?(response.data[:resultCode])
-            res[:result] = 'S'
-            res[:data] = response.data
-          else
-            res[:result] = 'F'
-          end
-
-          res
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.contract_create, ['0000', '0007'])
         end
 
       end # module Agree

data/lib/reapal/api/user/onekey_com_contract.rb

@@ -0,0 +1,78 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module User
+      module OnekeyComContract
+
+        # 1. 企业一键签约（API）
+        #
+        # @param flow_id [ String ] 订单号
+        # @param corp_name [ String ] 法人代表姓名
+        # @param identity_id [ String ] 法人身份证号
+        # @param com_name [ String ] 企业名称
+        # @param com_license [ String ] 组织机构代码/社会征信号
+        # @param lic_start_date [ Datetime ] 企业组织机构证起始日
+        # @param lic_end_date [ Datetime ] 企业组织机构证截止日
+        # @param phone [ String ] 手机号
+        # @param return_url [ String ] 回调 URL
+        # @param notify_url [ String ] 通知 URL
+        # @param email [ String ] 企业邮箱
+        # @param busway [ String ] 设备通道，默认手机端 00：PC端；01：手机端；02：Pad端；03：其它
+        # @param remark [ String ] 备注
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] 业务结果：'S/F/P'
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :error_code [String] 错误代号
+        #   * :error_msg [String] 错误信息
+        #   * :data: 具体业务返回信息
+        #     * :orderNo [String] 订单号
+        #     * :contracts [String] 企业签约协议号
+        #     * :resultCode [String] 结果代码 0000：申请成功 0002：签约成功（审核通过）0003：签约失败（审核不通过）0006：再次申请成功（拒绝后）
+        #     * :corpName [String] 法人代表姓名
+        #     * :corpIdentity [String] 法人身份证号
+        #     * :comLicense [String] 组织机构代码/社会征信号
+        #     * :licStartDate [String] 企业组织机构证起始日
+        #     * :licEndDate [String] 企业组织机构证截止日
+        #     * :mobile [String] 手机号
+        #     * :email [String] 企业邮箱
+        #     * :remark [String] 备注
+        #
+        def onekey_com_contract(flow_id, corp_name, identity_id, com_name, com_license,
+                                lic_start_date, lic_end_date, phone, return_url, notify_url,
+                                email='', busway='01', remark='')
+          service = 'reapal.trust.comContractAPI'
+          post_path = '/reagw/agreement/agree.htm'
+
+          params = {
+            orderNo: flow_id,
+            corpName: corp_name,
+            corpIdentity: identity_id,
+            comName: com_name,
+            comLicense: com_license,
+            licStartDate: lic_start_date,
+            licEndDate: lic_end_date,
+            mobile: phone,
+            email: email,
+            busway: busway,
+            returnUrl: return_url,
+            notifyUrl: notify_url,
+            remark: '',
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.contract_create, ['0002', '0006'])
+
+          if 'S' == res[:result] && '0003' == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
+        end
+
+      end # module
+    end
+  end
+end

data/lib/reapal/api/user/onekey_contract.rb

@@ -39,20 +39,7 @@ module Reapal
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          response = Http.post(service, params, @config, post_path)
-
-          res = Reapal::Utils.api_result(params, response)
-
-          return res if response.http_pending? # 比如超时等操作
-
-          # 个人签约只有返回码是 '0000', '0007' 才成功
-          if ['0000', '0007'].include?(response.data[:resultCode])
-            res[:result] = 'S'
-          else
-            res[:result] = 'F'
-          end
-
-          res
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.contract_create, ['0000', '0007'])
         end
 
       end # module

data/lib/reapal/api/user/undo_bind_bank_card.rb

@@ -7,8 +7,8 @@ module Reapal
 
         # 1.13 撤销绑卡 (API)
         #
-        # @param order_no [ String ] 订单号
-        # @param contract [ String ] 用户协议号
+        # @param flow_id [ String ] 订单号
+        # @param contracts [ String ] 用户协议号
         # @param bank_account_no [ String ] 银行卡信息（卡号后四位）
         #
         # @return [ Hash ] 结果集
@@ -21,37 +21,18 @@ module Reapal
         #       * :orderNo [String] 订单号
         #       * :resultCode [String] 结果代码 0000：撤销绑卡成功
         #
-        def undo_bind_bank_card(order_no, contracts, bank_account_no)
+        def undo_bind_bank_card(flow_id, contracts, bank_account_no)
           service = 'reapal.trust.undoBindBankCard'
           post_path = '/reagw/bankcard/undoBindBankApi.htm'
 
           params = {
-            orderNo: order_no,
+            orderNo: flow_id,
             contracts: contracts,
             bankAccountNo: bank_account_no,
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          response = Http.post(service, params, @config, post_path)
-
-          res = Reapal::Utils.api_result(params, response)
-
-          return res if response.http_pending? # 比如超时等操作
-
-          # 1，明确失败的
-          if Api::ErrorCode.bind_card.include?(response.data[:errorCode])
-            res[:result] = 'F'
-            return res
-          end
-
-          # 2. 明确正确的
-          if ['0000'].include?(response.data[:resultCode])
-            res[:result] = 'S'
-            return res
-          end
-
-          # 3. 其他错误 pending
-          res
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.bind_card, ['0000'])
         end
 
       end # module

data/lib/reapal/client.rb

@@ -23,8 +23,8 @@ module Reapal
       recursive_include_api('Reapal::Form')
     end
 
-    def decode_data(encryptkey, data)
-      ::Reapal::Http::decode_data(encryptkey, data, @config)
+    def decode_notify_data(encryptkey, data)
+      ::Reapal::Http::Decode.decode_notify_data(encryptkey, data, @config)
     end
 
     private

data/lib/reapal/form/business_auth_form.rb

@@ -1,61 +1,51 @@
 # coding: utf-8
 
 module Reapal
-    module Form
-      module BusinessAuth
-
-        # 3.20 标的授权 (Form)
-        #
-        # @param flow_id [String] 业务订单号
-        # @param contracts [String] 用户协议号
-        # @param services [String] 授权服务 02一键投标 ，03 为一键还款 04 一键债转
-        # @param busway [String] 00：PC端；01：手机端；02：Pad端；03：其它
-        # @param auth_limit [String] 授权期限日期 YYYYMMDD
-        # @param tender_no [String] 标的号,授权为一键还款时必填
-        # @param return_url [String] 回调 url
-        # @param notify_url [String] 通知 url
-        #
-
-        # @return [ Hash ] 结果集
-        #   * form_method
-        #     * url
-        #     * method
-        #   * form_data
-        #     * :merchant_id
-        #     * :encryptkey
-        #     * :data
-        #
-        def business_auth_form(flow_id, contracts, services, busway='01', auth_limit,
-                               tender_no, return_url, notify_url)
-
-          service = 'reapal.trust.businessAuth'
-          post_path = '/reagw/tender/rest.htm'
-
-          params = {
-            orderNo: flow_id,
-            contracts: contracts,
-            services: services,
-            busway: busway,
-            authLimit: auth_limit,
-            tenderNo: tender_no,
-            returnUrl: return_url,
-            notifyUrl: notify_url,
-            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: request
-          }
-
-        end
-
-      end #BusinessAuth
-    end
+  module Form
+    module BusinessAuthForm
+
+      # 3.20 标的授权 (Form)
+      #
+      # @param flow_id [String] 业务订单号
+      # @param contracts [String] 用户协议号
+      # @param services [String] 授权服务 02一键投标 ，03 为一键还款 04 一键债转
+      # @param auth_limit [String] 授权期限日期 YYYYMMDD
+      # @param return_url [String] 回调 url
+      # @param notify_url [String] 通知 url
+      # @param tender_no [String] 标的号,授权为一键还款时必填
+      # @param busway [String] 00：PC端；01：手机端；02：Pad端；03：其它
+      #
+      # @return [ Hash ] 结果集
+      #   * form_method
+      #     * url
+      #     * method
+      #   * form_data
+      #     * :merchant_id
+      #     * :encryptkey
+      #     * :data
+      #
+      def business_auth_form(flow_id, contracts, services, auth_limit,
+                             return_url, notify_url, tender_no=nil, busway='01')
+
+        service = 'reapal.trust.businessAuth'
+        post_path = '/reagw/user/rest.htm'
+
+        params = {
+          orderNo: flow_id,
+          contracts: contracts,
+          services: services,
+          busway: busway,
+          authLimit: auth_limit,
+          tenderNo: tender_no,
+          returnUrl: return_url,
+          notifyUrl: notify_url,
+          remark: '',
+          applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
+        }
+
+        get_form_data(service, params, post_path)
+      end
+
+    end #BusinessAuth
+  end
 end