fadada 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d693c4effe4af6f44bb7df2f1f571a8e8604c0129c9b0697d84840ede076a03e
-  data.tar.gz: 9389e7b9d00b8f2d3dc56cd004f480b8039a34340f2e4d7a37b682f567611d71
+  metadata.gz: 95de2a3553910d76031328a11efccbed5076c86effae254bf1e240f131a575e1
+  data.tar.gz: 37dbcf429b10db85932a46a5e1932887ad47ec042f71aa4de8d7eba9a0545a25
 SHA512:
-  metadata.gz: dcbbf3370e99c03a78b5f34b83156303d0ae2d138b9736a99eaee2c9b56436d32cd0f7ec082c78ecc0d613d1f6df638592aa9ffcd0e551c09d3e5956cbb2bd7e
-  data.tar.gz: d4debaa915256d876f965e4ec5c7be5ed694978ebdea785658453df998d4df7036bd41b1c51881184e4188ae6207f88ba566eefcbf918c0efca3f84638079fcc
+  metadata.gz: 757908f854b73543ea2052d27fe782ce33d37cbf1504d2e3f71445b0bba529f9eb6ecf7a8a01450e1d03ef1b4e66d0195440f7db5c992e1cd5cb80c923e57bc6
+  data.tar.gz: 4637d1427438de6d72af21e4be0b3ab965b097b19ec1e012ccddfadb658faf1ff11bdc104ed2872f148c25dfba23a0b47cb5ba76973426bb5bd687a6a4664ffb

data/lib/examples/contract.rb

@@ -1,6 +1,6 @@
 # 法大大实名认证接口调用顺序（五）
 
-contract_id = "39273648172364987169"
+contract_id = DateTime.now.to_i
 doc_title = "这是一个测试合同"
 contract_file = File.open('xxx')
 
@@ -12,58 +12,68 @@ options = {
 }
 Fadada::Contract.upload_doc(options)
 
+template_id = DateTime.now.to_i
+
 # 上传合同模板
 options = {
-  template_id: '9769867876876876',
+  template_id: template_id,
   file: contract_file
 }
 Fadada::Contract.upload_template(options)
 
+json_obj = {}
+(1..29).each do |item|
+  json_obj[item.to_s] = "this is #{item} test"
+end
 # 模板填充
 options = {
-
+  doc_title: "据说这是一个测试合同",
+  template_id: template_id,
+  contract_id: contract_id,
+  parameter_map: json_obj.to_json
 }
 Fadada::Contract.generate(options)
 
 # 自动签署合同
 options = {
-  transaction_id: 'A1028374019287342342',
+  transaction_id: DateTime.now.to_i,
   contract_id: contract_id,
   doc_title: doc_title,
+  sign_keyword: '杨米尔斯'
 }
 Fadada::Contract.auto_sign(options)
 
 # 手动签署合同
 options = {
-  transaction_id: 'B1028374019287341114',
+  transaction_id: DateTime.now.to_i,
   contract_id: contract_id,
   customer_id: '926064BA49FB4EAA0F1323A0B000DA22',
   doc_title: doc_title,
-  sign_keyword: '甲方（盖章）：',
+  sign_keyword: '杨米尔斯',
   keyword_strategy: '2',
-  customer_name: 'xx',
-  customer_ident_no: 'xx',
+  customer_name: '张三',
+  customer_ident_no: 'xxx',
   return_url: 'http://baidu.com'
 }
 Fadada::Contract.sign(options)
 
 # 批量手动签署合同
 sign_data = [{
-    contractId: '29273648172364987169',
-    signKeyword: '甲方（盖章）：',
-    transactionId: '4523454452',
-    # keyword_strategy: '2'
+    contractId: '123',
+    signKeyword: '甲方',
+    transactionId: DateTime.now.to_i,
+    keywordStrategy: '2'
   },{
-    contractId: '39273648172364987169',
-    signKeyword: '甲方（盖章）：',
-    transactionId: '23452345234',
-    # keyword_strategy: '2'
+    contractId: '456',
+    signKeyword: '甲方',
+    transactionId: DateTime.now.to_i,
+    keywordStrategy: '2'
   }].to_json
 
 options = {
   customer_id: '926064BA49FB4EAA0F1323A0B000DA22',
   # outh_customer_id: '',
-  batch_id: '23452345345345234',
+  batch_id: DateTime.now.to_i,
   batch_title: '批量合同签署',
   mobile_sign_type: '1',
   return_url: 'http://baidu.com',

data/lib/fadada/account.rb

@@ -12,8 +12,8 @@ module Fadada
     #   返回 法大大的账号
     def self.person_register(open_id)
       options = {
-        open_id: open_id,
-        account_type: 1 # 账户类型，1 个人；2 企业，默认 1
+        account_type: 1, # 账户类型，1 个人；2 企业，默认 1
+        open_id: open_id
       }
       response = Fadada::HttpClient.request(:post, 'account_register.api', options)
       response['data']
@@ -29,8 +29,8 @@ module Fadada
     #   返回 法大大的账号
     def self.company_register(open_id)
       options = {
-        open_id: open_id,
-        account_type: 2 # 账户类型，1 个人；2 企业，默认 1
+        account_type: 2, # 账户类型，1 个人；2 企业，默认 1
+        open_id: open_id
       }
       response = Fadada::HttpClient.request(:post, 'account_register.api', options)
       response['data']

data/lib/fadada/digest.rb

@@ -34,7 +34,7 @@ module Fadada
     # 需要排序后使用
     def self.params_transform(options)
       _options = options || {}
-      _options.delete_if { |key, value| value.blank? }.sort.map { |k,v| v }.join
+      _options.delete_if { |key, value| value.blank? }.map { |k,v| v }.join
     end
   end
 end

data/lib/fadada/signature.rb

@@ -26,8 +26,8 @@ module Fadada
     #   content => 印章展示的内容，可以是企业名称或者客户名称
     def self.custom(customer_id:, content:)
       options = {
-        customer_id: customer_id,
-        content: content
+        content: content,
+        customer_id: customer_id
       }
       response = Fadada::HttpClient.request(:post, 'custom_signature.api', options)
       response['data']['signature_img_base64']

data/lib/fadada/version.rb

@@ -1,3 +1,3 @@
 module Fadada
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fadada
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - wangrui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler