reapal 0.3.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234567f57cee288220964fc4bf120ae802400e36
-  data.tar.gz: 6362601c991f78ca39ee6d3ab0f80048fe1de8f8
+  metadata.gz: 754d2c42eb23d1e78d4d431f8a4ec6031433f43e
+  data.tar.gz: 6e31f13581fb4809ea9f2eba0004e5464cc19620
 SHA512:
-  metadata.gz: 75214217a309e67040291e008ed14f0dc5770fcc308b7a14b16d4913c2c3bf48fc65c3467d67dc955bbefb91051cbc4555536f5a29799fdf14bbc148770d7d62
-  data.tar.gz: 22dc9b134b5ef4a0fab39886be7b84cedc57ce5ef4987072caadc390b99a5b004accc714e1d8695048c521953781129ddb26404c449ee4016a2a2c7306095c4d
+  metadata.gz: 356e3ff37c0794855d8f5116498ecd9f04a3b84c983bae3a32cd71011bbac976ae36089dc20ada2d5e2fd82d9be5b20fbadfb94229cec0730472150aed2d889e
+  data.tar.gz: 723fc6770d66d8c5f954d2705381ced32018d99aa600c284ef5307db1e0c4ca2d2e387e35271f883d244f2f05d9a766d636e5fbd9c0e1583972557620d082d1a

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

@@ -43,7 +43,7 @@ module Reapal
           if 'S' == res[:result] && '0001' == res[:data][:resultCode]
             res[:result] = 'F'
           end
-          
+
           res
         end
 

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

@@ -5,7 +5,7 @@ module Reapal
     module Money
       module SubAccountQuery
 
-        # 2.8 企业分账查询（API）
+        # 2.12 企业分账查询（API）
         #
         # @param sub_account_flow_id [ String ] 分账订单号
         # @param serial_no [ String ] 分账流水号（传空串表示该订单批量查询）
@@ -33,7 +33,7 @@ module Reapal
           params = {
             orderNo: sub_account_flow_id,
             serialNo: serial_no,
-            queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
           operate_post(:query, service, params, post_path, Http::ErrorCode.sub_account_query, ['0000'])

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

@@ -6,11 +6,10 @@ module Reapal
 
         # 4.1 流水号查询（API）
         #
-        # @param serial_no [ String ] 业务流水号（对应满标、还款、债权转让分账明细的流水号）
+        # @param serial_no [ String ] 业务流水号（对应满标、还款分账明细的流水号）
         # @param service_type [Symbol] 查询类型，取值如下
         #   * :tender_finish 满标查询
         #   * :tender_refund 还款查询
-        #   * :tender_transfer 债权转让查询查询
         #
         # @return [ Hash ] 结果集
         #   * :result [String] 业务结果：'S/F/P'
@@ -28,8 +27,6 @@ module Reapal
                       'reapal.trust.tenderFinishSQuery'
                     when :tender_refund
                       'reapal.trust.tenderRefundSQuery'
-                    when :tender_transfer
-                      'reapal.trust.tenderTransferSQuery'
                     else
                       nil
                     end
@@ -40,7 +37,7 @@ module Reapal
             return res
           end
 
-          post_path = '/reagw/agreement/agreeApi.htm'
+          post_path = '/reagw/tender/rest.htm'
 
           params = {
             serialNo: serial_no,

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

@@ -24,12 +24,12 @@ 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, tender_no='', busway="01", remark='')
           service = 'reapal.trust.authCancel'
           post_path = '/reagw/user/restApi.htm'
 
           params = {
-            cancelOrderNo: flow_id,
+            cancleOrderNo: flow_id,
             contracts: contracts,
             services: services,
             busway: busway,

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

@@ -17,7 +17,6 @@ module Reapal
         #   * :error_code [String] 错误代号
         #   * :error_msg [String] 错误信息
         #   * :data: 具体业务返回信息
-        #     * :orderNo [String] 操作订单号
         #     * :contracts [String] 用户协议号
         #     * :servicesDetail [JSON] 授权明细
         #        * :services [String] 授权服务。 02一键投标 ，03 为一键还款 04 一键债转

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

@@ -50,7 +50,12 @@ module Reapal
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_finish, ['0000'])
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_finish, ['0000'])
+          if 'S' == res[:result] && '0001' == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module TenderFinish

data/lib/reapal/api/tender/{tender_onkey_invest.rb → tender_onekey_invest.rb}

@@ -43,7 +43,13 @@ module Reapal
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_invest, ['0000'])
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_invest, ['0000'])
+
+          if 'S' == res[:result] && '0001' == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module TenderOneKeyInvest

data/lib/reapal/api/tender/{tender_onkey_refund.rb → tender_onekey_refund.rb}

@@ -43,8 +43,8 @@ module Reapal
                                  tender_no,
                                  debit_contracts,
                                  debit_details,
-                                 invest_details='',
-                                 defray_details='',
+                                 invest_details=[],
+                                 defray_details=[],
                                  busway='01',
                                  remark='')
           service = 'reapal.trust.onekeyRefund'
@@ -62,7 +62,12 @@ module Reapal
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
           }
 
-          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_refund, ['0000'])
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_refund, ['0000'])
+          if 'S' == res[:result] && '0001' == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module TenderOneKeyRefund

data/lib/reapal/api/tender/{tender_onkey_single_transfer.rb → tender_onekey_single_transfer.rb}

@@ -13,7 +13,7 @@ module Reapal
         # @param money [BigDecimal] 债权转让承接人应支付金额
         # @param trans_contracts [String] 债权转让方在存管系统签约的协议号
         # @param into_contracts [String] 债权承接方在存管系统签约的协议号
-        # @param transfer_type [String] 债转类型
+        # @param transfer_type [String] 债转类型,传1表示首次债转，即转让人（transContracts）为tenderNo指代标的原始投资人,传2表示第N次债转,转让人（transContracts）并非原标的投资人
         # @param invest_order [String] 若transferType为1时,即首次债转时必传
         # @param org_transfer_order [String] 若transferType 为2时,即N次债转时必传
         # @param busway [String] 00：PC端；01：手机端；02：Pad端；03：其它
@@ -64,7 +64,12 @@ module Reapal
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
           }
 
-          operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_single_transfer, ['0000'])
+          res = operate_post(:operate, service, params, post_path, Http::ErrorCode.tender_onekey_single_transfer, ['0000'])
+          if 'S' == res[:result] && '0001' == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module TenderOneKeySingleTransfer

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

@@ -9,7 +9,7 @@ module Reapal
         #
         # @param flow_id [String] 执行还款计划订单号
         # @param tender_no [String] 商户系统标的号
-        # @param periods [String] 还款期数
+        # @param periods [Integer] 还款期数
         # @param comp_principal [BigDecimal] 执行还款本金
         # @param comp_interest [BigDecimal] 执行还款利息
         # @param comp_poundage [BigDecimal] 执行还款手续费

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

@@ -36,7 +36,7 @@ module Reapal
           params = {
             orderNo: flow_id,
             tenderNo: tender_no,
-            projectDetails: project_details.to_json,
+            projectDetails: project_details,
             busway: busway,
             remark: remark,
             applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),

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

@@ -25,12 +25,12 @@ module Reapal
         #       * :type  业务类型  A: 充值和提现; D: 充值; W: 提现
         #       * :is_safety  绑卡类别  0: 普通卡; 1:安全卡
         #       * :is_required_field  分支行信息  0: 省市分支行信息(系统默认信息); 1:用户自己所填信息
-        #       * :account_province  开户行所在省
+        #       * :account_province  开户行所在省 
         #       * :account_city  开户行所在市
         #       * :branch  开户行分行
         #       * :subbranch  开户行支行
         #
-        def bind_card_query(contracts, type = "W")
+        def bind_card_query(contracts, type='W')
           service = 'reapal.trust.bindQuery'
           post_path = '/reagw/user/restApi.htm'
 
@@ -42,14 +42,23 @@ module Reapal
 
           res = operate_post(:query, service, params, post_path, Http::ErrorCode.bind_card, ['0000'])
 
-          if 'S' == res[:result]
-            # TODO: (tony) 返回的银行字符串解析成数据，便于使用方
-            # res[:data][:bank_cards] = parse_cards_info(res[:data][:bank_cards])
+          if 'S' == res[:result] || ('P' == res[:result] && res[:data][:resultCode].nil?)
+            res[:result] = 'S'
+
+            res[:data][:bank_cards] = parse_cards_info(res[:data][:bankCards])
           end
 
           res
         end
 
+        private
+
+        def parse_cards_info(bank_cards)
+          cards_info = bank_cards.first.split("|")
+
+          cards_info
+        end
+
       end # module
     end
   end

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

@@ -2,7 +2,7 @@
 module Reapal
   module Api
     module User
-      module ModifyBankCardAddSms
+      module ModifyBindBankCard
 
         # 1.14 修改绑卡（API）
         #
@@ -24,14 +24,13 @@ module Reapal
         #       * :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)
-
+        def modify_bind_bank_card(flow_id,
+                                  contracts,
+                                  bank_account_no,
+                                  account_province,
+                                  account_city,
+                                  branch,
+                                  subbranch)
           service = 'reapal.trust.modifyBindBankCard'
           post_path = '/reagw/bankcard/modifyBindBankApi.htm'
 

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

@@ -5,7 +5,7 @@ module Reapal
     module User
       module OnekeyComContract
 
-        # 1. 企业一键签约（API）
+        # 1.4 企业一键签约（API）
         #
         # @param flow_id [ String ] 订单号
         # @param corp_name [ String ] 法人代表姓名
@@ -42,7 +42,7 @@ module Reapal
         #
         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='')
+                                email, busway='01', remark='')
           service = 'reapal.trust.comContractAPI'
           post_path = '/reagw/agreement/agree.htm'
 

data/lib/reapal/form/certificate_form.rb

@@ -22,7 +22,7 @@ module Reapal
       #     * :encryptkey
       #     * :data
       #
-      def withdraw_apply_form(flow_id, bind_id, contract, return_url, notify_url, terminal_type='mobile')
+      def certificate_form(flow_id, bind_id, contract, return_url, notify_url, terminal_type='mobile')
         service = 'reapal.trust.certificate'
         post_path = '/reagw/service/depwit.htm'
 

data/lib/reapal/http/error_code/money.rb

@@ -5,14 +5,28 @@ module Reapal
     module ErrorCode
 
       def self.deposit_common
-        @_deposit_common ||= %w(0001 0004)
-      end
-
-      def self.deposit
         @_deposit ||= %w(0000 0001 0003 0004 0005 0201 0202 0203 0204 0205
                          0206 0207 0208 0209 1701 1702 1703 1704 1705 1706
                          1707 1708 1709 1710 1711 1712 1713 1714 1801 1802
-                         1803 1804 1805 1901)
+                         1803 1804 1805 1901 1001 1002 1003 1004 1005 1006
+                         1007 1008 1009 1010 1011 1012 1013 1014 1015 1016
+                         1017 1018 1019 1020 1021 1023 1024 1025 1026 1027
+                         1028 1029 1030 1031 1032 1033 1034 1035 1036 1037
+                         1038 1039 1040 1041 1042 1043 1044 1047 1048 1049
+                         1050 1051 1088 1115 1806 2001 2002 2003 2004 2005
+                         2006 2007 2008 2009 2010 2011 2012 2013 2014 2015
+                         2016 2017 2018 2019 2020 2021 2022 2023 2024 2025
+                         2027 2028 2029 2030 2031 2032 2033 3001 3002 3003
+                         3004 3005 3006 3007 3008 3009 3010 3011 3012 3013
+                         3014 3015 3016 3017 3018 3019 3020 3021 3022 3023
+                         3024 3025 3026 3027 3028 3029 3030 3031 3032 3033
+                         3034 3035 3036 3037 3038 3039 3040 3041 3051 3052
+                         3053 3054 3056 3057 3058 3059 3060 3061 3062 3063
+                         3064 3065 3066 3067 3068 3069 3073 3074 3075 3077
+                         3078 3079 3080 3081 3083 3084 3086 3088 3094 3095
+                         3096 3097 3098 3099 3100 3135 3136 4001 4002 4003
+                         4004 4005 4006 4007 4008 4009 4010 4011 4012 4013
+                         4014 4015 4016 4017 4018 4019 6001 6002)
       end
 
       def self.deposit_apply_api
@@ -39,6 +53,15 @@ module Reapal
           0333 0324 0326 0327 0328 0329 0330 0331 0332 0333 0334 0335 0336
           0337 0338 0339 0340)
       end
+
+      def self.sub_account
+        @_sub_account ||= %w(0001 1601 1602 1603 1604 1605 1606 1607)
+      end
+
+      def self.sub_account_query
+        @_sub_account_query ||= %w(1608 1609 1610 1611)
+      end
+
     end # module ErrorCode
   end
 end

data/lib/reapal/http/error_code/tender.rb

@@ -38,11 +38,13 @@ module Reapal
       end
 
       def self.tender_auth_query
-        @_tender_auth_query ||= [] | tender_common
+        @_tender_auth_query ||= %w(1100 1101 1102 1103 1104 1105 1106 1107 1108 1109) | tender_common
       end
 
       def self.tender_auth_cancel
-        @_tender_auth_cancel ||= [] | tender_common
+        @_tender_auth_cancel ||= %w(1301 1302 1303 1304 1305 1306 1307 1308 1309
+                                    1310 1311 1312 1313 1314 1315 1316 1317 1318
+                                    1319 1320 1321 1322 1323 1324 1325) | tender_common
       end
 
       def self.tender_finish

data/lib/reapal/http/error_code/user.rb

@@ -14,7 +14,7 @@ module Reapal
          '0119', '0120', '0121', '0122', '0123', '0124', '0125', '0126', '0127',
          '0128', '0129', '0130', '0131', '0132', '0150', '0151', '0152', '0153',
          '0154', '0155', '0156', '0157', '0158', '0159', '0160', '0161', '0162',
-         '0163', '0164', '0165', '0166', '0167']
+         '0163', '0164', '0165', '0166', '0167', '0525']
       end
 
       def self.contract_query
@@ -26,20 +26,12 @@ module Reapal
       end
 
       def self.bind_card
-        @_bind_card ||= %w(9060 9065 9083 9084 9085 0017 0210 0302 0303 0328
+        @_bind_card ||= %w(9060 9064 9065 9083 9084 9085 0017 0210 0302 0303 0328
                            0329 0330 0332 0333 0335 0339 0340 0341 0342 0343
                            0344 0345 0346 0347 0348 0350 0351 0352 0358 0359
                            0360 0362 0363)
       end
 
-      def self.sub_account
-        @_sub_account ||= %w(0001 1601 1602 1603 1604 1605 1606 1607)
-      end
-
-      def self.sub_account_query
-        @_sub_account_query ||= %w(1608 1609 1610 1611)
-      end
-
     end # module ErrorCode
   end
 end

data/lib/reapal/version.rb

@@ -1,3 +1,3 @@
 module Reapal
-  VERSION = "0.3.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapal
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.9.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,9 +140,9 @@ files:
 - lib/reapal/api/tender/tender_auth_cancel.rb
 - lib/reapal/api/tender/tender_auth_query.rb
 - lib/reapal/api/tender/tender_finish.rb
-- lib/reapal/api/tender/tender_onkey_invest.rb
-- lib/reapal/api/tender/tender_onkey_refund.rb
-- lib/reapal/api/tender/tender_onkey_single_transfer.rb
+- lib/reapal/api/tender/tender_onekey_invest.rb
+- lib/reapal/api/tender/tender_onekey_refund.rb
+- lib/reapal/api/tender/tender_onekey_single_transfer.rb
 - lib/reapal/api/tender/tender_repayment_complete.rb
 - lib/reapal/api/tender/tender_repayment_project.rb
 - lib/reapal/api/user/balance_query.rb