reapal 0.9.13 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eccd66f92908953d1cf851afe749a99de500931a
-  data.tar.gz: bcf25aa7a9f780a5568064a69461aa765f0fd934
+  metadata.gz: a074850a4e4728b637d6915008604056eb888dac
+  data.tar.gz: d0efdad45edbddb795b371a72b06c030082809d2
 SHA512:
-  metadata.gz: 3b35b431ecfe2cdd1b752fc9676227916b53711e278e87456082e9db8dfc61be1f2e7823ea315041c033eb388d663bfe4ca944ff8cd33f6e88f8e595cf728559
-  data.tar.gz: 17b224265494b3789c98dcc797020eabc2e2760e207a7886a156e84715eeca95991493a314ab61b23c3605228ff77ec18adf054c3f8c93feb2cffd461c3b8c66
+  metadata.gz: 33a144d4c8e2ca30e79e3410aa4ebda45c2421119009b72fa0e9a914448fa3ecb29fa36e40f71ac06a6285a6e29a413171745fb1a41c0ca47dc3e12a8b4471b0
+  data.tar.gz: 3d411444bb4c59fc820c91d199aa3974f4010ee6d4b931138da3ca0b9d3288ebe4c3ee29acf669c8a8832f691a2ffba5808d438a883b6fccd8fd83a5132939d7

data/lib/reapal/api/api_helper.rb

@@ -14,7 +14,7 @@ module Reapal
       #
       # @return [ Hash ] 结果集(见通用返回)
       #
-      def operate_post(request_type, service, params, post_path, fail_codes, success_codes, version=nil)
+      def operate_post(request_type, service, params, post_path, fail_codes, success_codes, version='3.0')
         response = Http.post(service, params, @config, post_path, version)
 
         res = Reapal::Utils.api_result(params, response)

data/lib/reapal/api/money/deposit_query.rb

@@ -5,7 +5,7 @@ module Reapal
     module Money
       module DepositQuery
 
-        # 2.6 充值查询（API）
+        # 2.3 充值查询（API）
         #
         # @param deposit_flow_id [ String ] 充值订单号
         #

data/lib/reapal/api/money/member_payment_query.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Money
+      module MemberPaymentQuery
+
+        # 2.7 会员缴费查询
+        #
+        # @param member_payment_flow_id [ String ] 缴费订单号
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] 业务结果：'S/F/P'
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :error_code [String] 错误代号
+        #   * :error_msg [String] 错误信息
+        #   * :data: 具体业务返回信息
+        #     * :orderNo [String] 缴费订单号
+        #     * :amount [String] 缴费金额
+        #     * :resultCode [String] 结果代码 0000：缴费成功 0001:失败
+        #
+        def member_payment_query(member_payment_flow_id)
+          service = 'reapal.trust.memberPaymentQuery'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            orderNo: member_payment_flow_id,
+            queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          res = operate_post(:query, service, params, post_path, Http::ErrorCode.member_payment_query, ['0000'])
+
+          if 'P' == res[:result] && '0001' == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          Reapal.logger.info res
+
+          res
+        end
+
+      end
+    end
+  end
+end

data/lib/reapal/api/money/sub_account.rb

@@ -5,15 +5,15 @@ module Reapal
     module Money
       module SubAccount
 
-        # 2.11 企业分账（API）
+        # 2.8 企业分账（API）
         #
         # @param flow_id [ String ] 完成订单号
         # @param sub_type [ String ] 分账类型 1：代还款。2：分账。3：其它
         # @param sub_details [ Array ] 分账明细
-        #          * serial_no [String] 分账流水号
-        #          * payee_contracts [String] 收款方协议号
-        #          * amount [BigDecimal] 金额
-        #          * mark [String] 备注
+        #          * :serialNo [String] 分账流水号
+        #          * :payeeContracts [String] 收款方协议号
+        #          * :amount [BigDecimal] 金额
+        #          * :remark [String] 备注
         # @param remark [ String ] 业务备注信息
         #
         # @return [ Hash ] 结果集

data/lib/reapal/api/money/sub_account_query.rb

@@ -5,7 +5,7 @@ module Reapal
     module Money
       module SubAccountQuery
 
-        # 2.12 企业分账查询（API）
+        # 2.9 企业分账查询（API）
         #
         # @param sub_account_flow_id [ String ] 分账订单号
         # @param serial_no [ String ] 分账流水号（传空串表示该订单批量查询）

data/lib/reapal/api/money/withdraw_query.rb

@@ -5,7 +5,7 @@ module Reapal
     module Money
       module WithdrawQuery
 
-        # 2.8 提现查询（API）
+        # 2.5 提现查询（API）
         #
         # @param withdraw_flow_id [ String ] 提现订单号
         #

data/lib/reapal/api/order/query_by_single_flow_id.rb

@@ -21,6 +21,7 @@ module Reapal
         #   * :data: 具体业务返回信息
         #      * :orderNo [String] 商户订单号
         #      * :realAmount [String] 实际投标金额(只针对投标查询)
+        #      * :tenderStatus [String] 01：待确认 02：募集中 03：已放款 04：已结清 05：已逾期 99：已关闭(只针对发标查询)
         #      * :resultCode [String] 结果代码
         #
         def query_by_single_flow_id(flow_id, service_type)

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

@@ -0,0 +1,63 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Tender
+      module HistoryTenderInfoModify
+
+        # 3.19 历史标的信息修改
+        #
+        # @param flow_id [ String ] 订单号
+        # @param tender_no [ String ] 商户系统标的号
+        # @param fee_amount [ BigDecimal ] 手续费
+        # @param refund_term [ String ] 还款期数
+        # @param tender_type [String] 标的类别，是否允许自动投标。00：不允许自动投标 01：允许自动投标
+        # @param debit_contracts [String] 借款方协议号
+        # @param guarant_contract [String] 担保方协议号
+        # @param commissioned_contract [String] 受托方协议号
+        # @param tender_status [String] 标的状态 02：募集中 03：已放款 04：已结清
+        # @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] 结果代码 0000：成功
+        #
+        def history_tender_info_modify(flow_id, tender_no, fee_amount, refund_term,
+                                       tender_type, debit_contracts, guarant_contract=nil,
+                                       commissioned_contract=nil, tender_status=nil, busway='01', remark='')
+          service = 'reapal.trust.historyTenderInfoModify'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            orderNo: flow_id,
+            tenderNo: tender_no,
+            feeAmount: fee_amount,
+            refundTerm: refund_term,
+            tenderType: tender_type,
+            debitContracts: debit_contracts,
+            guarantContract: guarant_contract,
+            commissionedContract: commissioned_contract,
+            tenderStatus: tender_status,
+            busway: busway,
+            remark: remark,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.history_tender_info_modify, ['0000'])
+
+          Reapal.logger.info res
+
+          res
+        end
+
+      end # module TenderApply
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Tender
+      module RefundGuarantPaymentQuery
+
+        # 3.17  借款人还代偿款查询
+        #
+        # @param refund_flow_id [ String ] 还款订单号
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] 业务结果：'S/F/P'
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :error_code [String] 错误代号
+        #   * :error_msg [String] 错误信息
+        #   * :data: 具体业务返回信息
+        #     * :orderNo [String] 订单号
+        #     * :amount [Number] 金额
+        #     * :resultCode [String] 
+        #
+        def refund_guarant_payment_query(refund_flow_id)
+          service = 'reapal.trust.refundGuarantPaymentQuery'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            orderNo: refund_flow_id,
+            queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          res = operate_post(:query, service, params, post_path, Http::ErrorCode.refund_guarant_payment_query, ['0000'])
+
+          Reapal.logger.info res
+
+          res
+        end
+
+      end # module TenderAuthQuery
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Reapal
     module Tender
       module TenderAllCancel
 
-        # 3.7 撤标
+        # 3.6 撤标
         #
         # @param flow_id [String] 撤标订单号
         # @param tender_no [String] 商户系统标的号

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

@@ -12,12 +12,16 @@ module Reapal
         # @param tender_name [String] 商户系统标的名称
         # @param money [BigDecimal] 金额
         # @param rate [BigDecimal] 利率  10.3表示10.3%
-        # @param debit_term [integer] 标的期限
+        # @param fee_amount [BigDecimal] 手续费
+        # @param refund_term [String] 还款期数
+        # @param debit_term [Integer] 标的期限
         # @param debit_type [String] 期数类型,年：0，月：1，日：2
         # @param repay_date [Time] 还款日期
         # @param expiry_date [Time] 投标截止日期
+        # @param tender_type [String] 标的类别，是否允许自动投标。00：不允许自动投标 01：允许自动投标
         # @param debit_contracts [String] 借款方协议号
         # @param guarant_contract [String] 担保方协议号
+        # @param commissioned_contract [String] 受托方协议号
         # @param busway [String] 设备通道， '00'：PC端；'01'：手机端(默认)；'02'：Pad端；'03'：其它
         # @param remark [String] 备注
         #
@@ -31,9 +35,9 @@ module Reapal
         #      * :orderNo [String] 发标订单号
         #      * :resultCode [String] 结果代码
         #
-        def tender_apply(flow_id, tender_no, tender_name, money, rate,
-                         debit_term, debit_type, repay_date, expiry_date,
-                         debit_contracts, guarant_contract=nil, busway='01', remark='')
+        def tender_apply(flow_id, tender_no, tender_name, money, rate, fee_amount, refund_term,
+                         debit_term, debit_type, repay_date, expiry_date, tender_type, debit_contracts,
+                         guarant_contract=nil, commissioned_contract=nil, busway='01', remark='')
           service = 'reapal.trust.tenderApply'
           post_path = '/reagw/tender/rest.htm'
 
@@ -43,12 +47,16 @@ module Reapal
             tenderName: tender_name,
             amount: money,
             rate: rate,
+            feeAmount: fee_amount,
+            refundTerm: refund_term,
             debitTerm: debit_term,
             debitType: debit_type,
             repayDate: repay_date.strftime("%Y%m%d"),
             expiryDate: expiry_date.strftime("%Y%m%d"),
+            tenderType: tender_type,
             debitContracts: debit_contracts,
             guarantContract: guarant_contract,
+            commissionedContract: commissioned_contract,
             busway: busway,
             remark: remark,
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),

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

@@ -0,0 +1,77 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Tender
+      module TenderApplyModify
+
+        # 3.3 标的信息修改 
+        #
+        # @param flow_id [String] 订单号
+        # @param tender_no [String] 商户系统标的号
+        # @param tender_name [String] 商户系统标的名称
+        # @param money [BigDecimal] 金额
+        # @param rate [BigDecimal] 利率  10.3表示10.3%
+        # @param fee_amount [BigDecimal] 手续费
+        # @param refund_term [String] 还款期数
+        # @param debit_term [Integer] 标的期限
+        # @param debit_type [String] 期数类型,年：0，月：1，日：2
+        # @param repay_date [Time] 还款日期
+        # @param expiry_date [Time] 投标截止日期
+        # @param tender_type [String] 标的类别，是否允许自动投标。00：不允许自动投标 01：允许自动投标
+        # @param debit_contracts [String] 借款方协议号
+        # @param guarant_contract [String] 担保方协议号
+        # @param commissioned_contract [String] 受托方协议号
+        # @param tender_status [String] 标的状态 如果变更标的信息，则该字段为空，其他信息字段不为空，且标的状态为 01待确认。02：募集中 03：已放款 04：已结清 05：已逾期
+        # @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_apply_modify(flow_id, tender_no, tender_name, money, rate, fee_amount, refund_term,
+                                debit_term, debit_type, repay_date, expiry_date, tender_type, debit_contracts,
+                                guarant_contract=nil, commissioned_contract=nil, tender_status=nil, busway='01', remark='')
+          service = 'reapal.trust.tenderApplyModify'
+          post_path = '/reagw/tender/rest.htm'
+
+          params = {
+            orderNo: flow_id,
+            tenderNo: tender_no,
+            tenderName: tender_name,
+            amount: money,
+            rate: rate,
+            feeAmount: fee_amount,
+            refundTerm: refund_term,
+            debitTerm: debit_term,
+            debitType: debit_type,
+            repayDate: repay_date.strftime("%Y%m%d"),
+            expiryDate: expiry_date.strftime("%Y%m%d"),
+            tenderType: tender_type,
+            debitContracts: debit_contracts,
+            guarantContract: guarant_contract,
+            commissionedContract: commissioned_contract,
+            tenderStatus: tender_status,
+            busway: busway,
+            remark: remark,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_apply_modify, ['0000'])
+
+          Reapal.logger.info res
+
+          res
+        end
+
+      end # module TenderApply
+    end
+  end
+end

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

@@ -5,12 +5,11 @@ module Reapal
     module Tender
       module TenderAuthCancel
 
-        # 3.22 标的授权取消API
+        # 3.14 标的授权取消
         #
         # @param flow_id [String] 订单号
         # @param contracts [ String ] 用户协议号
-        # @param services [String] 授权业务。 02一键投标 ，03 为一键还款 04 一键债转
-        # @param tender_no [String] 标的号
+        # @param services [String] 授权业务。 02 自动投标 03 自动还款 05 自动担保还款
         # @param busway [String] 设备通道， '00'：PC端；'01'：手机端(默认)；'02'：Pad端；'03'：其它
         # @param remark [String] 备注
         #
@@ -24,7 +23,7 @@ module Reapal
         #     * :services [String] 授权业务。 02一键投标 ，03 为一键还款 04 一键债转
         #     * :resultCode [String] 结果代码
         #
-        def tender_auth_cancel(flow_id, contracts, services, tender_no='', busway="01", remark='')
+        def tender_auth_cancel(flow_id, contracts, services, busway="01", remark='')
           service = 'reapal.trust.authCancel'
           post_path = '/reagw/user/restApi.htm'
 
@@ -33,7 +32,6 @@ module Reapal
             contracts: contracts,
             services: services,
             busway: busway,
-            tenderNo: tender_no,
             remark: remark,
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }

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

@@ -5,10 +5,10 @@ module Reapal
     module Tender
       module TenderAuthQuery
 
-        # 3.21  标的授权查询
+        # 3.13  标的授权查询
         #
-        # @param flow_id [String] 操作订单号
-        # @param contracts [String] 用户协议号
+        # @param flow_id [ String ] 操作订单号
+        # @param contract [ String ] 用户协议号
         #
         # @return [ Hash ] 结果集
         #   * :result [String] 业务结果：'S/F/P'
@@ -17,19 +17,22 @@ module Reapal
         #   * :error_code [String] 错误代号
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
+        #     * :orderNo [String] 订单号
         #     * :contracts [String] 用户协议号
-        #     * :servicesDetail [JSON] 授权明细
-        #        * :services [String] 授权服务。 02一键投标 ，03 为一键还款 04 一键债转
+        #     * :servicesDetail [Array] 授权明细
+        #        * :services [String] 授权服务。 02 自动投标 ，03 自动还款 05 自动担保还款
         #        * :authLimit [String] 授权期限日期 YYYYMMDD
-        #        * :terderNo [String] 标的号
-
-        def tender_auth_query(flow_id, contracts)
+        #        * :amount [Number] 金额
+        #        * :usedTotalAmount [Number] 已使用授权金额
+        #        * :totalAmount [Number] 累计金额
+        #
+        def tender_auth_query(flow_id, contract)
           service = 'reapal.trust.authQuery'
           post_path = '/reagw/user/restApi.htm'
 
           params = {
             orderNo: flow_id,
-            contracts: contracts,
+            contracts: contract,
             queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }