lanmao 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22675238afe3c485d617602b939b5702ab5ca5a7
-  data.tar.gz: cc7ffbf5b3696d00d539dd6dad7ca699c816cb5a
+  metadata.gz: f4e06dd14297f9c04ab721712b046e2681066fde
+  data.tar.gz: 1acf049601236627a242c48007d953c8e4c5ecad
 SHA512:
-  metadata.gz: 2a25d05634c10a715a07f3e3c5d1dc90015fa8df0de769ba3204d30d80d69d592f609f414ad602e7d8307a78dd8f9e74c190f384824ee2efc6c5ab9f7c2c0cea
-  data.tar.gz: 92336f709d16e66e26ad2e9509d170fc1f1b95af198dfc0e363d4a228a008683b785f6ccc55fbfbe0a30e5aeed1f36a0dc13f8b00c465267a9d1f0d8caac6fa3
+  metadata.gz: 1dba39bafc8fb2d2b1cff4c02e07ce9784dd62be40dba947e74e47ccbbdb3f1f1c55dc6fc70287780ea43511bfe42d85d34170bf84b329710dc36d114439046c
+  data.tar.gz: 17c17c32f02e7ae1225bcaa5ccfdc5cb79a011ac14784d2c488609c6c57d668074ba84415fc993a9b4c9a7b463a02ebc342cc5299bde3806ead66fc2a32b2409

data/lanmao.gemspec

@@ -39,7 +39,9 @@ Gem::Specification.new do |spec|
   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 'macaddr', '~> 1.7'
+  spec.add_runtime_dependency 'rest-client', '~> 2.0'
+  spec.add_runtime_dependency 'activesupport', '~> 5.0'
 end

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

@@ -12,18 +12,21 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def cancel_debenture_sale()
+        def cancel_debenture_sale(flow_id, credit_sale_request_no)
+
+          service = "CANCEL_DEBENTURE_SALE"
 
           params = {
+            requestNo: flow_id,
+            creditsaleRequestNo: credit_sale_request_no
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,18 +12,24 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def cancel_pre_transaction()
+        def cancel_pre_transaction(flow_id, pre_transaction_no, amount, commission="", profit_details=[])
+
+          service = "CANCEL_PRE_TRANSACTION"
 
           params = {
+            requestNo: flow_id,
+            preTransactionNo: pre_transaction_no,
+            amount: amount,
+            commission: commission,
+            profitDetails: profit_details
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,18 +12,25 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :platformUserNo [String] 平台用户编号
+        #       * :requestNo [String] 流水号
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
+        #       * :authlist [String] 取消授权业务列表
         #
-        def cancel_user_authorization()
+        def cancel_user_authorization(flow_id, platform_user_no, auth_list)
+
+          service = "CANCEL_USER_AUTHORIZATION"
 
           params = {
+            platformUserNo: platform_user_no,
+            requestNo: flow_id,
+            authList: auth_list
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,19 +12,24 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def confirm_checkfile()
+        def confirm_checkfile(flow_id, file_date, detail, file_type)
+
+          service = "CONFIRM_CHECKFILE"
 
           params = {
+            requestNo: flow_id,
+            fileDate: file_date,
+            detail: detail,
+            fileType: file_type
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
-
+          res = operate_post(:operate, service, params, :service)
+          
           res
         end
 

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

@@ -12,18 +12,17 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :File [file] 对账文件
         #
-        def download_checkfile()
+        def download_checkfile(file_date)
+
+          service = "DOWNLOAD_CHECKFILE"
 
           params = {
+            fileDate: file_date
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,18 +12,23 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def freeze()
+        def freeze(flow_id, platform_user_no, amount, general_freeze_request="")
+
+          service = "FREEZE"
 
           params = {
+            platformUserNo: platform_user_no,
+            requestNo: flow_id,
+            generaFreezeRequest: general_freeze_request,
+            amount: amount
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,18 +12,23 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def freeze_pre_transaction()
+        def freeze_pre_transaction(flow_id, platform_user_no, biz_type, amount)
+
+          service = "FREEZE_PRE_TRANSACTION"
 
           params = {
+            requestNo: flow_id,
+            platformUserNo: platform_user_no,
+            bizType: biz_type,
+            amount: amount
           }
-
-          res = operate_post()
-
-          Lanmao.logger.info res
+          
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,18 +12,23 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def unfreeze()
+        def unfreeze(flow_id, amount, platform_user_no, original_freeze_request_no="")
+
+          service = "UNFREEZE"
 
           params = {
+            requestNo: flow_id,
+            amount: amount,
+            originalFreezeRequestNo: original_freeze_request_no,
+            platformUserNo: platform_user_no
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

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

@@ -12,18 +12,21 @@ module Lanmao
         #   * :code [String] 结果代码
         #   * :msg [String] 结果信息
         #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
         #
-        def unfreeze_trade_password()
+        def unfreeze_trade_password(flow_id, platform_user_no)
+
+          service = "UNFREEZE_TRADE_PASSWORD"
 
           params = {
+            requestNo: flow_id,
+            platformUserNo: platform_user_no
           }
 
-          res = operate_post()
-
-          Lanmao.logger.info res
+          res = operate_post(:operate, service, params, :service)
 
           res
         end

data/lib/lanmao/client.rb

@@ -6,6 +6,22 @@ module Lanmao
 
     attr_accessor :config
 
+    @system_contracts = {
+      chief: 'SYS_GENERATE_000', # 平台总账户
+      compensatme: 'SYS_GENERATE_001', # 平台代偿
+      marketing: 'SYS_GENERATE_002', # 平台营销款，比如红包
+      profit: 'SYS_GENERATE_003', # 平台分润
+      deduct: 'SYS_GENERATE_004', # 平台收入，比如收取用户费用
+      interest: 'SYS_GENERATE_005', # 平台派息
+      recharge: 'SYS_GENERATE_006', # 平台代充值
+      loan: 'SYS_GENERATE_007', # 平台垫资账户
+    }
+    @system_contracts.each { |k, v|
+      define_method :"#{k}_system_contract" do |*args|
+        v
+      end
+    }
+
     def initialize(options_arg)
       options = Utils.symbolize_keys(options_arg)
       @config = {

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

@@ -6,6 +6,8 @@ module Lanmao
         #
         #  2.1 个人绑卡注册
         #
+        # @param fail_time [ Time ] 授权期限
+        #
         # @return [ Hash ] 结果集
         # @return [ Hash ] 结果集
         #   * :form_method
@@ -14,7 +16,9 @@ module Lanmao
         #   * :form_data
         #     * :data
         #
-        def personal_register_expand_form(user_no, flow_id, true_name, id_card_no, bank_card_no, phone, id_card_type, role_type, check_type, return_url, user_limit_type='ID_CARD_NO_UNIQUE', auth_list='')
+        def personal_register_expand_form(user_no, flow_id, true_name, id_card_no, bank_card_no, phone,
+                                          id_card_type, role_type, check_type, return_url,
+                                          user_limit_type='ID_CARD_NO_UNIQUE', auth_list='', fail_time='', amount='')
           service = 'PERSONAL_REGISTER_EXPAND'
 
           params = {
@@ -30,6 +34,8 @@ module Lanmao
             redirectUrl: return_url,
             userLimitType: user_limit_type,
             authList: auth_list,
+            failTime: fail_time,
+            amount: amount,
           }
 
           res = get_form_data(service, params)

data/lib/lanmao/form/{account → trade}/user_authorization_form.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Lanmao
   module Form
-    module Account
+    module Trade 
       module UserAuthorizationForm
         #
         # @return [ Hash ] 结果集

data/lib/lanmao/form/{account → trade}/user_pre_transaction_form.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Lanmao
   module Form
-    module Account
+    module Trade
       module UserPreTransactionForm
         #
         #

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

@@ -0,0 +1,43 @@
+# coding: utf-8
+module Lanmao
+  module Api
+    module Trade
+      module VerifyDeduct
+        # 验密扣费
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] "S"/"F"/"P"
+        #   * :request_params [Hash] 请求参数
+        #   * :response [Object] 请求返回对象
+        #   * :code [String] 结果代码
+        #   * :msg [String] 结果信息
+        #   * :data: 具体业务返回信息
+        #       * :requestNo [String] 请求流水号
+        #       * :code [Enum] 返回吗
+        #       * :status [Enum] 业务处理状态（处理失败INIT；处理成功SUCCESS）
+        #       * :errorCode [String] 错误码
+        #       * :errorMessage [String] 错误描述
+        #
+        def verify_deduct_form(flow_id, platform_user_no, amount, target_platform_user_no, redirect_url, expired, custom_define="")
+
+          service = "VERIFY_DEDUCT"
+
+          params = {
+            requestNo: flow_id,
+            platformUserNo: platform_user_no,
+            amount: amount,
+            targetPlatformUserNo: target_platform_user_no,
+            redirectUrl: redirect_url,
+            expired: expired,
+            customDefine: custom_define
+          }
+
+          res = get_form_data(service, params)
+
+          res
+        end
+
+      end # module
+    end
+  end
+end

data/lib/lanmao/http/request.rb

@@ -3,9 +3,12 @@ module Lanmao
   module Http
 
     class Request
+      require 'active_support/all'
+
       def initialize(params, config, service, type)
+        Time.zone = "Beijing"
         @params = params
-        @params[:timestamp] = Time.now.strftime('%Y%m%d%H%M%S') # 时间戳
+        @params[:timestamp] = Time.now.in_time_zone("Beijing").strftime('%Y%m%d%H%M%S') # 时间戳
 
         @config = config
         @service = service

data/lib/lanmao/version.rb

@@ -1,3 +1,3 @@
 module Lanmao
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanmao
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  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'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: 新网银行的存管实现
 email:
 - gandalf@omniaccount.com
@@ -169,10 +225,7 @@ files:
 - lib/lanmao/api/trade/modify_project.rb
 - lib/lanmao/api/trade/unfreeze.rb
 - lib/lanmao/api/trade/unfreeze_trade_password.rb
-- lib/lanmao/api/trade/user_authorization.rb
 - lib/lanmao/api/trade/user_auto_pre_transaction.rb
-- lib/lanmao/api/trade/user_pre_transaction.rb
-- lib/lanmao/api/trade/verify_deduct.rb
 - lib/lanmao/client.rb
 - lib/lanmao/extensions.rb
 - lib/lanmao/form/account/.gitkeep
@@ -186,13 +239,14 @@ files:
 - lib/lanmao/form/account/personal_register_expand_form.rb
 - lib/lanmao/form/account/reset_password_form.rb
 - lib/lanmao/form/account/unbind_bankcard_form.rb
-- lib/lanmao/form/account/user_authorization_form.rb
-- lib/lanmao/form/account/user_pre_transaction_form.rb
 - lib/lanmao/form/form_helper.rb
 - lib/lanmao/form/money/.gitkeep
 - lib/lanmao/form/money/recharge_form.rb
 - lib/lanmao/form/money/withdraw_form.rb
 - lib/lanmao/form/trade/.gitkeep
+- lib/lanmao/form/trade/user_authorization_form.rb
+- lib/lanmao/form/trade/user_pre_transaction_form.rb
+- lib/lanmao/form/trade/verify_deduct_form.rb
 - lib/lanmao/http/error_code/account.rb
 - lib/lanmao/http/error_code/money.rb
 - lib/lanmao/http/error_code/query.rb

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

@@ -1,34 +0,0 @@
-# coding: utf-8
-module Lanmao
-  module Api
-    module Trade
-      module UserAuthorization
-        # 用户授权
-        #
-        # @return [ Hash ] 结果集
-        #   * :result [String] "S"/"F"/"P"
-        #   * :request_params [Hash] 请求参数
-        #   * :response [Object] 请求返回对象
-        #   * :code [String] 结果代码
-        #   * :msg [String] 结果信息
-        #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
-        #
-        def user_authorization()
-
-          params = {
-          }
-
-          res = operate_post()
-
-          Lanmao.logger.info res
-
-          res
-        end
-
-      end # module
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-# coding: utf-8
-module Lanmao
-  module Api
-    module Trade
-      module UserPreTransaction
-        # 用户预处理
-        #
-        # @return [ Hash ] 结果集
-        #   * :result [String] "S"/"F"/"P"
-        #   * :request_params [Hash] 请求参数
-        #   * :response [Object] 请求返回对象
-        #   * :code [String] 结果代码
-        #   * :msg [String] 结果信息
-        #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
-        #
-        def user_pre_transaction()
-
-          params = {
-          }
-
-          res = operate_post()
-
-          Lanmao.logger.info res
-
-          res
-        end
-
-      end # module
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-# coding: utf-8
-module Lanmao
-  module Api
-    module Trade
-      module VerifyDeduct
-        # 验密扣费
-        #
-        # @return [ Hash ] 结果集
-        #   * :result [String] "S"/"F"/"P"
-        #   * :request_params [Hash] 请求参数
-        #   * :response [Object] 请求返回对象
-        #   * :code [String] 结果代码
-        #   * :msg [String] 结果信息
-        #   * :data: 具体业务返回信息
-        #       * :url [String] 支付 url
-        #       * :order_no [String] 订单号
-        #       * :amount [Number] 金额
-        #
-        def verify_deduct()
-
-          params = {
-          }
-
-          res = operate_post()
-
-          Lanmao.logger.info res
-
-          res
-        end
-
-      end # module
-    end
-  end
-end