reapal 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f07450399aff5e61821fcee6cb015cea5a9dba50
-  data.tar.gz: 012e44028f84adc559630c4d0c1d1f42c8623876
+  metadata.gz: 3938c51eb0a3a516c9b0f00d0c65997aedcc197e
+  data.tar.gz: 3f462ab6ca89611339c02d324fe3f32b7f7751ae
 SHA512:
-  metadata.gz: bb0f870317b28a8221fe3f43bf4c3870159b6a0d7319ab462f7b7c9100c525097b9a9a02c0694657eff5588c063a2157fc649749eafc699940136e842191861b
-  data.tar.gz: 5a5e61e47f8480856ce748ff9d8c09971e29a01bb03346c795153253f38584a122d548671ea93a46b4c2eb1c5184f3b824f12fb65efa228cafecdcdc5cad632b
+  metadata.gz: 8086a05b2a92c98df5bf400f52bade2b93f12e01782b05a0ecd03f105b15170e3f0ab435891cac68c308276988f0f2af511c9142ad4ebb1f14cfb063f3ccb9c6
+  data.tar.gz: 1ab8be84c88d531bf0168ef867608a29baf13af5a9d51de0cb8c336059a02a385c212a2ebabf2b949a238fa02044f0e207306cc109892953a23ec7f4c8528427

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

@@ -40,7 +40,18 @@ module Reapal
            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
          }
 
-         operate_post(:operate, service, params, post_path, Http::ErrorCode.deposit_confirm_api, ['0000'])
+         res = operate_post(:operate, service, params, post_path, Http::ErrorCode.deposit_confirm_api, ['0000'])
+
+         error_result_code = %w(9060 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
+                                0001 0004)
+
+         if 'S' == res[:result] && error_result_code.include?(res[:data][:resultCode])
+           res[:result] = 'F'
+         end
+
+         res
        end
 
      end # module

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

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

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

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

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

@@ -55,7 +55,13 @@ module Reapal
             queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          operate_post(:query, service, params, post_path, Http::ErrorCode.query_by_flow_id, ['0000'])
+          res = operate_post(:query, service, params, post_path, Http::ErrorCode.query_by_flow_id, ['0000'])
+
+          if 'S' == res[:result] && ('0001' || '0003') == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module QueryByFlowId

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

@@ -46,7 +46,13 @@ module Reapal
             queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
           }
 
-          operate_post(:query, service, params, post_path, Http::ErrorCode.query_by_single_flow_id, ['0000'])
+          res = operate_post(:query, service, params, post_path, Http::ErrorCode.query_by_single_flow_id, ['0000'])
+
+          if 'S' == res[:result] && ('0001' || '0003') == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module QueryBySingleFlowId

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

@@ -44,7 +44,13 @@ module Reapal
             queryTime: Time.now.strftime('%Y-%m-%d %H:%M:%S')
           }
 
-          operate_post(:query, service, params, post_path, Http::ErrorCode.tender_auth_query, ['0000'])
+          res = operate_post(:query, service, params, post_path, Http::ErrorCode.tender_auth_query, ['0000'])
+
+          if 'S' == res[:result] && ('0001' || '0003') == res[:data][:resultCode]
+            res[:result] = 'F'
+          end
+
+          res
         end
 
       end # module Agree

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

@@ -29,7 +29,7 @@ module Reapal
         #      * :resultCode [String] 结果代码
         #
         def tender_repayment_complete(flow_id, tender_no, periods, comp_principal, comp_interest,
-                               comp_poundage, comp_amount, comp_time, busway='01', remark='')
+                                      comp_poundage, comp_amount, comp_time, busway='01', remark='')
           service = 'reapal.trust.repaymentComplete'
           post_path = '/reagw/tender/rest.htm'
 

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

@@ -9,7 +9,7 @@ module Reapal
         #
         # @param flow_id [String] 还款计划订单号
         # @param tender_no [String] 商户系统标的号
-        # @param project_details [String] 还款计划明细
+        # @param project_details [Array] 还款计划明细
         #   * :periods [Integer] 还款期数
         #   * :projPrincipal [BigDecimal] 计划还款本金
         #   * :projInterest [BigDecimal] 计划还款利息
@@ -33,8 +33,6 @@ module Reapal
           service = 'reapal.trust.repaymentProject'
           post_path = '/reagw/tender/rest.htm'
 
-          project_details[0][:projTime] = project_details[0][:projTime].strftime('%Y%m%d')
-
           params = {
             orderNo: flow_id,
             tenderNo: tender_no,

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

@@ -18,7 +18,7 @@ module Reapal
       end
 
       def self.com_contract_create
-        ['9015'] || contract_create || contract_common
+        ['9015'] | contract_create | contract_common
       end
 
       def self.contract_query

data/lib/reapal/version.rb

@@ -1,3 +1,3 @@
 module Reapal
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapal
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler