lanmao 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f874714afef893bbacc2bc3e46f0a1b42ea7b4dc
-  data.tar.gz: 25465e2e9bc94e7d41ec0bce31ee31e586468f66
+  metadata.gz: 1b382344e2692e4ea4bed87489cbdd44be2d3c3f
+  data.tar.gz: f9cf220cc90da310ce90f7c77f59e78d4ea68a80
 SHA512:
-  metadata.gz: 5dacc24490443c3331171772756f2555e76d6b47d57e254d5b6608ff1d4b98fcbf7efd96a39509da777eb9d367fe4523aa5ead77198bc5fb17eb8ba4352da52a
-  data.tar.gz: f0efeda1dad9d2a068e01b5e805c2c34564cd8c7e38b851a12d7db96e660276f3a54ccc414b56c65a817e3da574dee114d6ef9c0b90b58acc861c2011d1c3e1b
+  metadata.gz: 4946201426ee9b3f0c18ae839f334dab68a961bed32bafc99d7f86c8ac546071d413a4a71d1b8f49281eedcb5b401ba506455d6864870b9c54ebb9de4031f944
+  data.tar.gz: a0e0e63ba2754f02c6820de6fa382854ead6a35eeaeaade81471892677118ca6dd5ac6ad49a6b4a7681bade97568460f5a774bf87a44a1aed71aebc7a0953312

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.2.5
+- 2.3.1
 before_install:
 - cp spec/support/config/config.uat.yml spec/support/config/config.yml
 notifications:

data/lanmao.gemspec

@@ -31,17 +31,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'activesupport', '~> 5.0'
+  spec.add_runtime_dependency 'rest-client', '~> 2.0'
+  spec.add_runtime_dependency 'macaddr', '~> 1.7'
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'macaddr', '~> 1.7'
-  spec.add_development_dependency 'rest-client', '~> 2.0'
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'faker', '~> 1.8'
   spec.add_development_dependency 'byebug', '~> 9.1'
-  spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'activesupport', '~> 5.0'
-
-  spec.add_runtime_dependency 'macaddr', '~> 1.7'
-  spec.add_runtime_dependency 'rest-client', '~> 2.0'
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'
+  spec.add_development_dependency 'awesome_print', '~> 1.8'
 end

data/lib/lanmao/api/money/confirm_withdraw.rb

@@ -24,14 +24,14 @@ module Lanmao
         #       * :createTime [Time] 交易发起时间
         #       * :transactionTime [Time] 交易完成时间
         #
-        def confirm_withdraw(flow_id, pre_transaction_no, withdraw_way)
+        def confirm_withdraw(flow_id, pre_transaction_no, withdraw_type)
 
           service = "CONFIRM_WITHDRAW"
 
           params = {
             requestNo: flow_id,
             preTransactionNo: pre_transaction_no,
-            withdrawWay: withdraw_way
+            withdrawType: withdraw_type
           }
 
           res = operate_post(:operate, service, params, :service)

data/lib/lanmao/api/money/intercept_withdraw.rb

@@ -24,7 +24,7 @@ module Lanmao
 
           params = {
             requestNo: flow_id,
-            preTransactionNo: pre_transaction_no
+            withdrawRequestNo: pre_transaction_no
           }
 
           res = operate_post(:operate, service, params, :service)

data/lib/lanmao/api/query/query_transaction.rb

@@ -22,13 +22,12 @@ module Lanmao
         #       * :asset_no [String] 标的号
         #       * :status	受托支付签约状态 [Integer] 0：普通标的 1：签约 2：未签约
         #
-        def query_transaction(flow_id, transaction_type, user_no)
+        def query_transaction(flow_id, transaction_type)
           service = 'QUERY_TRANSACTION'
 
           params = {
             requestNo: flow_id,
             transactionType: transaction_type,
-            platformUserNo: user_no,
           }
 
           res = operate_post(:query, service, params, :service)

data/lib/lanmao/api/trade/cancel_pre_transaction.rb

@@ -17,7 +17,7 @@ module Lanmao
         #       * :errorCode [String] 错误码
         #       * :errorMessage [String] 错误描述
         #
-        def cancel_pre_transaction(flow_id, pre_transaction_no, amount, commission="", profit_details=[])
+        def cancel_pre_transaction(flow_id, pre_transaction_no, amount, commission=nil, profit_details=nil)
 
           service = "CANCEL_PRE_TRANSACTION"
 

data/lib/lanmao/form/account/enterprise_bind_bankcard.rb

@@ -21,7 +21,7 @@ module Lanmao
             requestNo: flow_id,
             redirectUrl: redirect_url,
             platformUserNo: platform_user_no,
-            checkType: bank_card_no,
+            bankcardNo: bank_card_no,
             bankcode: bank_code,
             bindType: bind_type,
           }

data/lib/lanmao/form/account/enterprise_information_update_form.rb

@@ -17,7 +17,7 @@ module Lanmao
           service = "ENTERPRISE_INFORMATION_UPDATE"
 
           params = {
-            requetNo: flow_id,
+            requestNo: flow_id,
             platformUserNo: platform_user_no,
             redirectUrl: redirect_url
           }

data/lib/lanmao/form/account/modify_mobile_expand_form.rb

@@ -17,7 +17,7 @@ module Lanmao
           service = "MODIFY_MOBILE_EXPAND"
 
           params = {
-            requetNo: flow_id,
+            requestNo: flow_id,
             platformUserNo: platform_user_no,
             redirectUrl: redirect_url,
             checkType: check_type,

data/lib/lanmao/form/money/recharge_form.rb

@@ -29,12 +29,12 @@ module Lanmao
         #       * :channelErrorCode [String] 支付通道错误码(若快捷充值回调方式传入 DIRECT_CALLBACK，则返回 此参数)技术支持单独提供
         #       * :channelErrorMessage [String] 支付通道返回错误消息(若快捷充值回调方式传入 DIRECT_CALLBACK， 则返回此参数)技术支持单独提供
         #
-        def recharge(platform_user_no, request_no, amount,
-                     expect_pay_company, recharge_way="SWIFT",
-                     redirect_url, expired,
-                     commission, bankcode, pay_type,
-                     authtrade_type, authtender_amount,
-                     project_no, callback_mode)
+        def recharge_form(platform_user_no, request_no, amount,
+                          expect_pay_company, recharge_way="SWIFT",
+                          redirect_url, expired,
+                          commission, bankcode, pay_type,
+                          authtrade_type, authtender_amount,
+                          project_no, callback_mode)
 
           service = "RECHARGE"
 

data/lib/lanmao/form/trade/user_pre_transaction_form.rb

@@ -15,7 +15,7 @@ module Lanmao
         def user_pre_transaction_form(request_no, user_no, biz_type,
                                  amount, expired, redirect_url,
                                  project_no, share, creditsale_request_no,
-                                 pre_marketing_amount, remark="")
+                                 pre_marketing_amount)
           service = 'USER_PRE_TRANSACTION'
 
           params = {
@@ -29,7 +29,6 @@ module Lanmao
             share: share,
             creditsaleRequestNo: creditsale_request_no,
             preMarketingAmount: pre_marketing_amount,
-            remark: remark,
           }
 
           res = get_form_data(service, params)

data/lib/lanmao/http/request.rb

@@ -81,7 +81,7 @@ module Lanmao
       end
 
       def flow_id
-        @params[:requestNo]
+        @params[:requestNo] || @params[:batchNo]
       end
 
       def identifier

data/lib/lanmao/sign/rsa.rb

@@ -19,7 +19,7 @@ module Lanmao
         else
           true
         end
-      end # verify
+      end # verify func
 
     end
   end

data/lib/lanmao/version.rb

@@ -1,3 +1,3 @@
 module Lanmao
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: lanmao
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: macaddr
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,132 +53,90 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '9.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: macaddr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '9.1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '1.8'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-description: 新网银行的存管实现
+        version: '1.8'
+description: "新网银行的存管实现"
 email:
 - gandalf@omniaccount.com
 executables: []
@@ -200,13 +158,10 @@ files:
 - lib/lanmao/api/account/audit_bind_card.rb
 - lib/lanmao/api/api_helper.rb
 - lib/lanmao/api/money/.gitkeep
-- lib/lanmao/api/money/auto_withdraw.rb
 - lib/lanmao/api/money/cancel_withdraw.rb
 - lib/lanmao/api/money/confirm_withdraw.rb
-- lib/lanmao/api/money/direct_recharge.rb
 - lib/lanmao/api/money/intercept_withdraw.rb
 - lib/lanmao/api/query/.gitkeep
-- lib/lanmao/api/query/query_authorization_entrust_pay_record.rb
 - lib/lanmao/api/query/query_project_information.rb
 - lib/lanmao/api/query/query_transaction.rb
 - lib/lanmao/api/query/qurey_user_information.rb
@@ -279,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: 懒猫存管系统 SDK
+summary: "懒猫存管系统 SDK"
 test_files: []

data/lib/lanmao/api/money/auto_withdraw.rb

@@ -1,37 +0,0 @@
-# coding: utf-8
-module Lanmao
-  module Api
-    module Money
-      module Withdraw
-
-        #
-        # @return [ Hash ] 结果集
-        #   * :result [String] "S"/"F"/"P"
-        #   * :request_params [Hash] 请求参数
-        #   * :response [Object] 请求返回对象
-        #   * :code [String] 结果代码
-        #   * :msg [String] 结果信息
-        #   * :data: 具体业务返回信息
-        #
-        def auto_withdraw(user_no, flow_id, withdraw_type,
-                     amount, commission=nil)
-
-          service = 'AUTO_WITHDRAW'
-
-          params = {
-            platformUserNo: user_no,
-            requestNo: flow_id,
-            withdrawType: withdraw_type,
-            amount: amount,
-            commission: commission
-          }
-
-          res = operate_post(:operate, service, params, :service)
-
-          res
-        end
-
-      end
-    end
-  end
-end

data/lib/lanmao/api/money/direct_recharge.rb

@@ -1,41 +0,0 @@
-# coding: utf-8
-module Lanmao
-  module Api
-    module Money
-      module DirectRecharge
-        # 自动充值
-        #
-        # @return [ Hash ] 结果集
-        #   * :result [String] "S"/"F"/"P"
-        #   * :request_params [Hash] 请求参数
-        #   * :response [Object] 请求返回对象
-        #   * :code [String] 结果代码
-        #   * :msg [String] 结果信息
-        #   * :data: 具体业务返回信息
-        #       * :serial_no [String] 交易流水号
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
-        #       * :balance [Number] 操作后账户余额
-        #
-        def direct_recharge(flow_id, platform_user_no, amount, pay_company, recharge_way, commission=0)
-
-          service = "DIRECT_RECHARGE"
-
-          params = {
-            requestNo: flow_id,
-            platformUserNo: platform_user_no,
-            amount: amount,
-            expectPayCommission: commission,
-            rechargeWay: recharge_way,
-            commission: commission
-          }
-
-          res = operate_post(:operate, service, params, :service)
-
-          res
-        end
-
-      end # module
-    end
-  end
-end

data/lib/lanmao/api/query/query_authorization_entrust_pay_record.rb

@@ -1,32 +0,0 @@
-# coding: utf-8
-module Lanmao
-  module Api
-    module Query
-      module QueryAuthorizationEntrustPayRecord
-        #
-        #  委托支付授权记录查询
-        #
-        # @return [ Hash ] 结果集
-        #   * :result [String] "S"/"F"/"P"
-        #   * :request_params [Hash] 请求参数
-        #   * :response [Object] 请求返回对象
-        #   * :code [String] 结果代码
-        #   * :msg [String] 结果信息
-        #   * :data: 具体业务返回信息
-        #
-        def query_authorization_entrust_pay_record(flow_id)
-          service = 'QUERY_AUTHORIZATION_ENTRUST_PAY_RECORD'
-
-          params = {
-            requestNo: flow_id,
-          }
-
-          res = operate_post(:query, service, params, :service)
-
-          res
-        end
-
-      end
-    end
-  end
-end