reapal 0.2.2 → 0.3.0

data/lib/reapal/api/tender/tender_onkey_refund.rb

@@ -0,0 +1,71 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Tender
+      module TenderOneKeyRefund
+
+        # 3.13 一键还款
+        #
+        # @param flow_id [ String ] 还款订单号
+        # @param tender_no [ String ] 商户系统标的的标号
+        # @param debit_contracts [String] 借款方协议号
+        # @param debit_details [JSON] 借款方还款
+        #   *seria_no [String] 还款流水号
+        #   *payee_contracts [String] 收款方协议号
+        #   *amount [String] 金额
+        #   *remark [String] 备注
+        # @param invest_details [JSON] 投资方分账
+        #   *seria_no [String] 还款分账流水号
+        #   *invest_contracts [String] 投资方协议号
+        #   *payee_contracts [String] 收款方协议号
+        #   *amount [String] 金额
+        #   *remark [String] 备注
+        # @param defray_details [JSON] 担保方分账
+        #   *seria_no [String] 还款流水号
+        #   *payee_contracts [String] 付款方协议号
+        #   *amount [String] 金额
+        #   *remark [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] 还款订单号
+        #      * :resultCode [String] 结果代码
+        #
+        def tender_onekey_refund(flow_id,
+                                 tender_no,
+                                 debit_contracts,
+                                 debit_details,
+                                 invest_details='',
+                                 defray_details='',
+                                 busway='01',
+                                 remark='')
+          service = 'reapal.trust.onekeyRefund'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            orderNo: flow_id,
+            tenderNo: tender_no,
+            debitContracts: debit_contracts,
+            debitDetails: debit_details,
+            investDetails: invest_details,
+            defrayDetails: defray_details,
+            busway: busway,
+            remark: remark,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
+          }
+
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_refund, ['0000'])
+        end
+
+      end # module TenderOneKeyRefund
+    end
+  end
+end

data/lib/reapal/api/tender/tender_onkey_single_transfer.rb

@@ -0,0 +1,73 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Tender
+      module TenderOneKeySingleTransfer
+
+        # 3.19 一键债权转让
+        #
+        # @param flow_id [String] 业务订单号
+        # @param tender_no [String] 转让方原投资标的号
+        # @param trans_capital [BigDecimal] 转让人出让的本金
+        # @param money [BigDecimal] 债权转让承接人应支付金额
+        # @param trans_contracts [String] 债权转让方在存管系统签约的协议号
+        # @param into_contracts [String] 债权承接方在存管系统签约的协议号
+        # @param transfer_type [String] 债转类型
+        # @param invest_order [String] 若transferType为1时,即首次债转时必传
+        # @param org_transfer_order [String] 若transferType 为2时,即N次债转时必传
+        # @param busway [String] 00：PC端；01：手机端；02：Pad端；03：其它
+        # @param fee [BigDecimal] 手续费  默认为空
+        # @param fee_type [String] 手续费收取方向。 手续费收取方向 1 收取转让方，2 收取承接方 。手续费不为空时此字段必传,手续费为空时此字段不传
+        # @param remark [String] 备注  默认为空
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] 业务结果：'S/F/P'
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :error_code [String] 错误代号
+        #   * :error_msg [String] 错误信息
+        #   * :data: 具体业务返回信息
+        #      * :orderNo [String] 业务订单号
+        #      * :resultCode [String] 结果代码
+        #
+        def tender_onekey_single_transfer(flow_id,
+                                          tender_no,
+                                          trans_capital,
+                                          money,
+                                          trans_contracts,
+                                          into_contracts,
+                                          transfer_type,
+                                          invest_order,
+                                          org_transfer_order,
+                                          busway='01',
+                                          fee='',
+                                          fee_type='',
+                                          remark='')
+          service = 'reapal.trust.onekeySignleTransfer'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            orderNo: flow_id,
+            tenderNo: tender_no,
+            transCapital: trans_capital,
+            amount: money,
+            transContracts: trans_contracts,
+            intoContracts: into_contracts,
+            fee: fee,
+            feeType: fee_type,
+            transferType: transfer_type,
+            investOrder: invest_order,
+            orgTransferOrder: org_transfer_order,
+            busway: busway,
+            remark: remark,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
+          }
+
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_single_transfer, ['0000'])
+        end
+
+      end # module TenderOneKeySingleTransfer
+    end
+  end
+end

data/lib/reapal/api/{asset → tender}/tender_repayment_complete.rb

@@ -2,7 +2,7 @@
 
 module Reapal
   module Api
-    module Asset
+    module Tender
       module TenderRepaymentComplete
 
         # 3.15 还款计划更新（API）
@@ -17,7 +17,7 @@ module Reapal
         # @param comp_time [String] 执行还款日期
         # @param busway [String] 设备通道， '00'：PC端；'01'：手机端(默认)；'02'：Pad端；'03'：其它
         # @param remark [String] 备注
-
+        #
         # @return [ Hash ] 结果集
         #   * :result [String] 业务结果：'S/F/P'
         #   * :request_params [Hash] 请求参数
@@ -47,26 +47,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'还款信息同步成功
-          if ['0000'].include?(response.data[:resultCode])
-            res[:result] = "S"
-          end
-
-          #确定的错误
-          if Reapal::Api::ErrorCode.tender_repayment_complete.include?(response.data[:resultCode])
-            res[:result] = "F"
-            return res
-          end
-
-          # 不能确定的错误 ，pending
-          res
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_repayment_complete, ['0000'])
         end
 
       end # module TenderRepaymentComplete

data/lib/reapal/api/{asset → tender}/tender_repayment_project.rb

@@ -2,23 +2,23 @@
 
 module Reapal
   module Api
-    module Asset
+    module Tender
       module TenderRepaymentProject
 
         # 3.14 还款计划
         #
         # @param flow_id [String] 还款计划订单号
         # @param tender_no [String] 商户系统标的号
-        # @param project_details [String] 还款计划明细
+        # @param project_details [hash] 还款计划明细
         #   * :periods [Integer] 还款期数
-        #   * :projPrincipal [BigDecimal] 计划还款本金
-        #   * :projInterest [BigDecimal] 计划还款利息
-        #   * :projPoundage [BigDecimal] 计划还款手续费
-        #   * :projAmount [BigDecimal] 计划还款总金额
-        #   * :projTime [String] 计划还款日期
+        #   * :proj_principal [BigDecimal] 计划还款本金
+        #   * :proj_interest [BigDecimal] 计划还款利息
+        #   * :proj_poundage [BigDecimal] 计划还款手续费
+        #   * :proj_amount [BigDecimal] 计划还款总金额
+        #   * :proj_time [String] 计划还款日期
         # @param busway [String] 设备通道， '00'：PC端；'01'：手机端(默认)；'02'：Pad端；'03'：其它
         # @param remark [String] 备注
-
+        #
         # @return [ Hash ] 结果集
         #   * :result [String] 业务结果：'S/F/P'
         #   * :request_params [Hash] 请求参数
@@ -36,32 +36,13 @@ module Reapal
           params = {
             orderNo: flow_id,
             tenderNo: tender_no,
-            projectDetails: project_details,
+            projectDetails: project_details.to_json,
             busway: busway,
             remark: remark,
             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'还款信息同步成功
-          if ['0000'].include?(response.data[:resultCode])
-            res[:result] = "S"
-          end
-
-          #确定的错误
-          if Reapal::Api::ErrorCode.tender_repayment_project.include?(response.data[:resultCode])
-            res[:result] = "F"
-            return res
-          end
-
-          # 不能确定的错误 ，pending
-          res
+          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_repayment_project, ['0000'])
         end
 
       end # module TenderRepaymentProject

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

@@ -16,9 +16,9 @@ module Reapal
         #   * :error_code [String] 错误代号
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
-        #     * :total_amount [BigDecimal] 账户总额
-        #     * :usable_amount [BigDecimal] 可用金额
-        #     * :tender_amount [BigDecimal] 投标金额
+        #     * :totalAmount [BigDecimal] 账户总额
+        #     * :usableAmount [BigDecimal] 可用金额
+        #     * :tenderAmount [BigDecimal] 投标金额
         #
         def balance_query(contracts)
           service = 'reapal.trust.balanceQuery'
@@ -29,29 +29,18 @@ 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, ['0113'], ['0000'])
 
-          res = Reapal::Utils.api_result(params, response)
+          if 'S' == res[:result] || ('P' == res[:result] && res[:data][:resultCode].nil?)
+            res[:result] = 'S'
 
-          # 查询类 api，http 没成功都返回 pending
-          return res unless response.http_success?
-
-          # 如果查不到这个人
-          if response.data[:errorCode] == '0113'
-            res[:result] = 'F'
-            return res
+            res[:data] = {
+              totalAmount: res[:data][:totalAmount].to_d,
+              usableAmount: res[:data][:usableAmount].to_d,
+              tenderAmount: res[:data][:tenderAmount].to_d,
+            }
           end
 
-          # 其余 api 错误不知道
-          return res unless response.data[:errorCode].nil?
-
-          res[:result] = 'S'
-          res[:data] = {
-            totalAmount: response.data[:totalAmount].to_d,
-            usableAmount: response.data[:usableAmount].to_d,
-            tenderAmount: response.data[:tenderAmount].to_d,
-          }
-
           res
         end
 

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

@@ -1,3 +1,4 @@
+# coding: utf-8
 module Reapal
   module Api
     module User
@@ -5,7 +6,7 @@ module Reapal
 
         # 1.10 一键绑卡申请（API）
         #
-        # @param order_no [ String ] 订单号
+        # @param flow_id [ String ] 订单号
         # @param contracts [ String ] 用户协议号
         # @param bank_code [ String ] 银行代码
         # @param bank_account_no [ String ] 银行卡账号
@@ -14,7 +15,7 @@ module Reapal
         # @param branch [ String] 银行分行
         # @param subbranch [ String ] 银行支行
         # @param mobile_phone [ String ] 银行预留手机
-
+        #
         # @return [ Hash ] 结果集
         #   * :result [String] "S"/"F"/"P"
         #   * :request_params [Hash] 请求参数
@@ -22,15 +23,24 @@ module Reapal
         #   * :error_code [String] 错误代号
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
-        #       * :order_no [ String ]  订单号
+        #       * :flow_id [ String ]  订单号
         #       * :result_code [ String ] 结果代码 0000：申请成功
         #
-        def bank_card_add_sms(order_no, contracts, bank_code, bank_account_no, account_province, account_city, branch, subbranch, mobile_phone)
+        def bank_card_add_sms(flow_id,
+                              contracts,
+                              bank_code,
+                              bank_account_no,
+                              account_province,
+                              account_city,
+                              branch,
+                              subbranch,
+                              mobile_phone)
+
           service = 'reapal.trust.bankCardAddSMS'
           post_path = '/reagw/bankcard/bankCardSMS.htm'
 
           params = {
-            orderNo: order_no,
+            orderNo: flow_id,
             contracts: contracts,
             bankCode: bank_code,
             bankAccountNo: bank_account_no,
@@ -42,27 +52,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? # 比如超时等操作
-
-          # 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/api/user/bank_card_add_sms_again.rb

@@ -7,7 +7,7 @@ module Reapal
 
         # 1.11 一键绑卡重发短信（API）
         #
-        # @param order_no [ String ] 交易订单号（非自动生成，与一键绑卡申请短信订单号保持一致）
+        # @param flow_id [ String ] 交易订单号（非自动生成，与一键绑卡申请短信订单号保持一致）
         # @param contracts [ String ] 用户协议号
         # @param busway [ String ] 设备通道 00：PC端；01：手机端；02：Pad端；03：其它
         # @param remark [ String ] 业务备注信息
@@ -19,41 +19,22 @@ module Reapal
         #   * :error_code [String] 错误代号
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
-        #      * :order_no [ String ] 交易订单号
+        #      * :flow_id [ String ] 交易订单号
         #      * :result_code [ String ] 结果代码 0000：绑卡成功
         #
-        def bank_card_add_sms_again(order_no, contracts, busway = '01', remark = "")
+        def bank_card_add_sms_again(flow_id, contracts, busway = '01', remark = "")
           service = 'reapal.trust.bankCardAddSMSAgain'
           post_path = '/reagw/bankcard/bankCardSMS.htm'
 
           params = {
-            orderNo: order_no,
+            orderNo: flow_id,
             contracts: contracts,
             busway: busway,
             remark: remark,
             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.deposit.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/api/user/bank_card_add_sms_confirm.rb

@@ -7,7 +7,7 @@ module Reapal
 
         # 1.11 一键绑卡确认（API）
         #
-        # @param order_no [ String ] 交易订单号（与一键绑卡申请订单号保持一致）
+        # @param flow_id [ String ] 交易订单号（与一键绑卡申请订单号保持一致）
         # @param check_code [ String ] 短信验证码
         # @param busway [ String ] 设备通道 00：PC端；01：手机端；02：Pad端；03：其它
         # @param remark [ String ] 业务备注信息
@@ -19,40 +19,21 @@ module Reapal
         #   * :error_code [String] 错误代号
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
-        #       * :order_no [ String ] 交易订单号
+        #       * :flow_id [ String ] 交易订单号
         #       * :result_code [ String ] 结果代码 0000：绑卡成功
         #
-        def bank_card_add_sms_confirm(order_no, check_code = '123456', busway = '01', remark = "")
+        def bank_card_add_sms_confirm(flow_id, check_code = '123456', busway = '01', remark = "")
           service = 'reapal.trust.bankCardAddSMSConfirm'
           post_path = '/reagw/bankcard/bankCardSMS.htm'
 
           params = {
-            orderNo: order_no,
+            orderNo: flow_id,
             checkCode: check_code,
             busway: busway,
             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