lanmao 0.10.0 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -1
- data/lanmao.gemspec +5 -8
- data/lib/lanmao/api/money/confirm_withdraw.rb +2 -2
- data/lib/lanmao/api/money/intercept_withdraw.rb +1 -1
- data/lib/lanmao/api/query/query_transaction.rb +1 -2
- data/lib/lanmao/api/trade/cancel_pre_transaction.rb +1 -1
- data/lib/lanmao/form/account/enterprise_bind_bankcard.rb +1 -1
- data/lib/lanmao/form/account/enterprise_information_update_form.rb +1 -1
- data/lib/lanmao/form/account/modify_mobile_expand_form.rb +1 -1
- data/lib/lanmao/form/money/recharge_form.rb +6 -6
- data/lib/lanmao/form/trade/user_pre_transaction_form.rb +1 -2
- data/lib/lanmao/http/request.rb +1 -1
- data/lib/lanmao/sign/rsa.rb +1 -1
- data/lib/lanmao/version.rb +1 -1
- metadata +33 -78
- data/lib/lanmao/api/money/auto_withdraw.rb +0 -37
- data/lib/lanmao/api/money/direct_recharge.rb +0 -41
- data/lib/lanmao/api/query/query_authorization_entrust_pay_record.rb +0 -32
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1b382344e2692e4ea4bed87489cbdd44be2d3c3f
|
4
|
+
data.tar.gz: f9cf220cc90da310ce90f7c77f59e78d4ea68a80
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4946201426ee9b3f0c18ae839f334dab68a961bed32bafc99d7f86c8ac546071d413a4a71d1b8f49281eedcb5b401ba506455d6864870b9c54ebb9de4031f944
|
7
|
+
data.tar.gz: a0e0e63ba2754f02c6820de6fa382854ead6a35eeaeaade81471892677118ca6dd5ac6ad49a6b4a7681bade97568460f5a774bf87a44a1aed71aebc7a0953312
|
data/.travis.yml
CHANGED
data/lanmao.gemspec
CHANGED
@@ -31,17 +31,14 @@ Gem::Specification.new do |spec|
|
|
31
31
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
32
32
|
spec.require_paths = ["lib"]
|
33
33
|
|
34
|
+
spec.add_runtime_dependency 'activesupport', '~> 5.0'
|
35
|
+
spec.add_runtime_dependency 'rest-client', '~> 2.0'
|
36
|
+
spec.add_runtime_dependency 'macaddr', '~> 1.7'
|
37
|
+
|
34
38
|
spec.add_development_dependency "bundler", "~> 1.16"
|
35
39
|
spec.add_development_dependency "rake", "~> 10.0"
|
36
|
-
spec.add_development_dependency 'macaddr', '~> 1.7'
|
37
|
-
spec.add_development_dependency 'rest-client', '~> 2.0'
|
38
40
|
spec.add_development_dependency "rspec", "~> 3.0"
|
39
41
|
spec.add_development_dependency 'faker', '~> 1.8'
|
40
42
|
spec.add_development_dependency 'byebug', '~> 9.1'
|
41
|
-
spec.add_development_dependency 'awesome_print'
|
42
|
-
spec.add_development_dependency 'activesupport', '~> 5.0'
|
43
|
-
|
44
|
-
spec.add_runtime_dependency 'macaddr', '~> 1.7'
|
45
|
-
spec.add_runtime_dependency 'rest-client', '~> 2.0'
|
46
|
-
spec.add_runtime_dependency 'activesupport', '~> 5.0'
|
43
|
+
spec.add_development_dependency 'awesome_print', '~> 1.8'
|
47
44
|
end
|
@@ -24,14 +24,14 @@ module Lanmao
|
|
24
24
|
# * :createTime [Time] 交易发起时间
|
25
25
|
# * :transactionTime [Time] 交易完成时间
|
26
26
|
#
|
27
|
-
def confirm_withdraw(flow_id, pre_transaction_no,
|
27
|
+
def confirm_withdraw(flow_id, pre_transaction_no, withdraw_type)
|
28
28
|
|
29
29
|
service = "CONFIRM_WITHDRAW"
|
30
30
|
|
31
31
|
params = {
|
32
32
|
requestNo: flow_id,
|
33
33
|
preTransactionNo: pre_transaction_no,
|
34
|
-
|
34
|
+
withdrawType: withdraw_type
|
35
35
|
}
|
36
36
|
|
37
37
|
res = operate_post(:operate, service, params, :service)
|
@@ -22,13 +22,12 @@ module Lanmao
|
|
22
22
|
# * :asset_no [String] 标的号
|
23
23
|
# * :status 受托支付签约状态 [Integer] 0:普通标的 1:签约 2:未签约
|
24
24
|
#
|
25
|
-
def query_transaction(flow_id, transaction_type
|
25
|
+
def query_transaction(flow_id, transaction_type)
|
26
26
|
service = 'QUERY_TRANSACTION'
|
27
27
|
|
28
28
|
params = {
|
29
29
|
requestNo: flow_id,
|
30
30
|
transactionType: transaction_type,
|
31
|
-
platformUserNo: user_no,
|
32
31
|
}
|
33
32
|
|
34
33
|
res = operate_post(:query, service, params, :service)
|
@@ -17,7 +17,7 @@ module Lanmao
|
|
17
17
|
# * :errorCode [String] 错误码
|
18
18
|
# * :errorMessage [String] 错误描述
|
19
19
|
#
|
20
|
-
def cancel_pre_transaction(flow_id, pre_transaction_no, amount, commission=
|
20
|
+
def cancel_pre_transaction(flow_id, pre_transaction_no, amount, commission=nil, profit_details=nil)
|
21
21
|
|
22
22
|
service = "CANCEL_PRE_TRANSACTION"
|
23
23
|
|
@@ -29,12 +29,12 @@ module Lanmao
|
|
29
29
|
# * :channelErrorCode [String] 支付通道错误码(若快捷充值回调方式传入 DIRECT_CALLBACK,则返回 此参数)技术支持单独提供
|
30
30
|
# * :channelErrorMessage [String] 支付通道返回错误消息(若快捷充值回调方式传入 DIRECT_CALLBACK, 则返回此参数)技术支持单独提供
|
31
31
|
#
|
32
|
-
def
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
32
|
+
def recharge_form(platform_user_no, request_no, amount,
|
33
|
+
expect_pay_company, recharge_way="SWIFT",
|
34
|
+
redirect_url, expired,
|
35
|
+
commission, bankcode, pay_type,
|
36
|
+
authtrade_type, authtender_amount,
|
37
|
+
project_no, callback_mode)
|
38
38
|
|
39
39
|
service = "RECHARGE"
|
40
40
|
|
@@ -15,7 +15,7 @@ module Lanmao
|
|
15
15
|
def user_pre_transaction_form(request_no, user_no, biz_type,
|
16
16
|
amount, expired, redirect_url,
|
17
17
|
project_no, share, creditsale_request_no,
|
18
|
-
pre_marketing_amount
|
18
|
+
pre_marketing_amount)
|
19
19
|
service = 'USER_PRE_TRANSACTION'
|
20
20
|
|
21
21
|
params = {
|
@@ -29,7 +29,6 @@ module Lanmao
|
|
29
29
|
share: share,
|
30
30
|
creditsaleRequestNo: creditsale_request_no,
|
31
31
|
preMarketingAmount: pre_marketing_amount,
|
32
|
-
remark: remark,
|
33
32
|
}
|
34
33
|
|
35
34
|
res = get_form_data(service, params)
|
data/lib/lanmao/http/request.rb
CHANGED
data/lib/lanmao/sign/rsa.rb
CHANGED
data/lib/lanmao/version.rb
CHANGED
metadata
CHANGED
@@ -1,43 +1,43 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lanmao
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.11.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- tony
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-06-
|
11
|
+
date: 2018-06-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
|
-
name:
|
14
|
+
name: activesupport
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
20
|
-
type: :
|
19
|
+
version: '5.0'
|
20
|
+
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '5.0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
|
-
name:
|
28
|
+
name: rest-client
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
34
|
-
type: :
|
33
|
+
version: '2.0'
|
34
|
+
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '2.0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: macaddr
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -45,7 +45,7 @@ dependencies:
|
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '1.7'
|
48
|
-
type: :
|
48
|
+
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
@@ -53,132 +53,90 @@ dependencies:
|
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '1.7'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
56
|
+
name: bundler
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
61
|
+
version: '1.16'
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
68
|
+
version: '1.16'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
70
|
+
name: rake
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '
|
75
|
+
version: '10.0'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '
|
82
|
+
version: '10.0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
84
|
+
name: rspec
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '
|
89
|
+
version: '3.0'
|
90
90
|
type: :development
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '
|
96
|
+
version: '3.0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
name:
|
98
|
+
name: faker
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: '
|
103
|
+
version: '1.8'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: '
|
111
|
-
- !ruby/object:Gem::Dependency
|
112
|
-
name: awesome_print
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
114
|
-
requirements:
|
115
|
-
- - ">="
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: '0'
|
118
|
-
type: :development
|
119
|
-
prerelease: false
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
requirements:
|
122
|
-
- - ">="
|
123
|
-
- !ruby/object:Gem::Version
|
124
|
-
version: '0'
|
110
|
+
version: '1.8'
|
125
111
|
- !ruby/object:Gem::Dependency
|
126
|
-
name:
|
112
|
+
name: byebug
|
127
113
|
requirement: !ruby/object:Gem::Requirement
|
128
114
|
requirements:
|
129
115
|
- - "~>"
|
130
116
|
- !ruby/object:Gem::Version
|
131
|
-
version: '
|
117
|
+
version: '9.1'
|
132
118
|
type: :development
|
133
119
|
prerelease: false
|
134
120
|
version_requirements: !ruby/object:Gem::Requirement
|
135
121
|
requirements:
|
136
122
|
- - "~>"
|
137
123
|
- !ruby/object:Gem::Version
|
138
|
-
version: '
|
139
|
-
- !ruby/object:Gem::Dependency
|
140
|
-
name: macaddr
|
141
|
-
requirement: !ruby/object:Gem::Requirement
|
142
|
-
requirements:
|
143
|
-
- - "~>"
|
144
|
-
- !ruby/object:Gem::Version
|
145
|
-
version: '1.7'
|
146
|
-
type: :runtime
|
147
|
-
prerelease: false
|
148
|
-
version_requirements: !ruby/object:Gem::Requirement
|
149
|
-
requirements:
|
150
|
-
- - "~>"
|
151
|
-
- !ruby/object:Gem::Version
|
152
|
-
version: '1.7'
|
153
|
-
- !ruby/object:Gem::Dependency
|
154
|
-
name: rest-client
|
155
|
-
requirement: !ruby/object:Gem::Requirement
|
156
|
-
requirements:
|
157
|
-
- - "~>"
|
158
|
-
- !ruby/object:Gem::Version
|
159
|
-
version: '2.0'
|
160
|
-
type: :runtime
|
161
|
-
prerelease: false
|
162
|
-
version_requirements: !ruby/object:Gem::Requirement
|
163
|
-
requirements:
|
164
|
-
- - "~>"
|
165
|
-
- !ruby/object:Gem::Version
|
166
|
-
version: '2.0'
|
124
|
+
version: '9.1'
|
167
125
|
- !ruby/object:Gem::Dependency
|
168
|
-
name:
|
126
|
+
name: awesome_print
|
169
127
|
requirement: !ruby/object:Gem::Requirement
|
170
128
|
requirements:
|
171
129
|
- - "~>"
|
172
130
|
- !ruby/object:Gem::Version
|
173
|
-
version: '
|
174
|
-
type: :
|
131
|
+
version: '1.8'
|
132
|
+
type: :development
|
175
133
|
prerelease: false
|
176
134
|
version_requirements: !ruby/object:Gem::Requirement
|
177
135
|
requirements:
|
178
136
|
- - "~>"
|
179
137
|
- !ruby/object:Gem::Version
|
180
|
-
version: '
|
181
|
-
description: 新网银行的存管实现
|
138
|
+
version: '1.8'
|
139
|
+
description: "新网银行的存管实现"
|
182
140
|
email:
|
183
141
|
- gandalf@omniaccount.com
|
184
142
|
executables: []
|
@@ -200,13 +158,10 @@ files:
|
|
200
158
|
- lib/lanmao/api/account/audit_bind_card.rb
|
201
159
|
- lib/lanmao/api/api_helper.rb
|
202
160
|
- lib/lanmao/api/money/.gitkeep
|
203
|
-
- lib/lanmao/api/money/auto_withdraw.rb
|
204
161
|
- lib/lanmao/api/money/cancel_withdraw.rb
|
205
162
|
- lib/lanmao/api/money/confirm_withdraw.rb
|
206
|
-
- lib/lanmao/api/money/direct_recharge.rb
|
207
163
|
- lib/lanmao/api/money/intercept_withdraw.rb
|
208
164
|
- lib/lanmao/api/query/.gitkeep
|
209
|
-
- lib/lanmao/api/query/query_authorization_entrust_pay_record.rb
|
210
165
|
- lib/lanmao/api/query/query_project_information.rb
|
211
166
|
- lib/lanmao/api/query/query_transaction.rb
|
212
167
|
- lib/lanmao/api/query/qurey_user_information.rb
|
@@ -279,8 +234,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
279
234
|
version: '0'
|
280
235
|
requirements: []
|
281
236
|
rubyforge_project:
|
282
|
-
rubygems_version: 2.
|
237
|
+
rubygems_version: 2.4.5.1
|
283
238
|
signing_key:
|
284
239
|
specification_version: 4
|
285
|
-
summary: 懒猫存管系统 SDK
|
240
|
+
summary: "懒猫存管系统 SDK"
|
286
241
|
test_files: []
|
@@ -1,37 +0,0 @@
|
|
1
|
-
# coding: utf-8
|
2
|
-
module Lanmao
|
3
|
-
module Api
|
4
|
-
module Money
|
5
|
-
module Withdraw
|
6
|
-
|
7
|
-
#
|
8
|
-
# @return [ Hash ] 结果集
|
9
|
-
# * :result [String] "S"/"F"/"P"
|
10
|
-
# * :request_params [Hash] 请求参数
|
11
|
-
# * :response [Object] 请求返回对象
|
12
|
-
# * :code [String] 结果代码
|
13
|
-
# * :msg [String] 结果信息
|
14
|
-
# * :data: 具体业务返回信息
|
15
|
-
#
|
16
|
-
def auto_withdraw(user_no, flow_id, withdraw_type,
|
17
|
-
amount, commission=nil)
|
18
|
-
|
19
|
-
service = 'AUTO_WITHDRAW'
|
20
|
-
|
21
|
-
params = {
|
22
|
-
platformUserNo: user_no,
|
23
|
-
requestNo: flow_id,
|
24
|
-
withdrawType: withdraw_type,
|
25
|
-
amount: amount,
|
26
|
-
commission: commission
|
27
|
-
}
|
28
|
-
|
29
|
-
res = operate_post(:operate, service, params, :service)
|
30
|
-
|
31
|
-
res
|
32
|
-
end
|
33
|
-
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
# coding: utf-8
|
2
|
-
module Lanmao
|
3
|
-
module Api
|
4
|
-
module Money
|
5
|
-
module DirectRecharge
|
6
|
-
# 自动充值
|
7
|
-
#
|
8
|
-
# @return [ Hash ] 结果集
|
9
|
-
# * :result [String] "S"/"F"/"P"
|
10
|
-
# * :request_params [Hash] 请求参数
|
11
|
-
# * :response [Object] 请求返回对象
|
12
|
-
# * :code [String] 结果代码
|
13
|
-
# * :msg [String] 结果信息
|
14
|
-
# * :data: 具体业务返回信息
|
15
|
-
# * :serial_no [String] 交易流水号
|
16
|
-
# * :order_no [String] 订单号
|
17
|
-
# * :amount [Number] 金额
|
18
|
-
# * :balance [Number] 操作后账户余额
|
19
|
-
#
|
20
|
-
def direct_recharge(flow_id, platform_user_no, amount, pay_company, recharge_way, commission=0)
|
21
|
-
|
22
|
-
service = "DIRECT_RECHARGE"
|
23
|
-
|
24
|
-
params = {
|
25
|
-
requestNo: flow_id,
|
26
|
-
platformUserNo: platform_user_no,
|
27
|
-
amount: amount,
|
28
|
-
expectPayCommission: commission,
|
29
|
-
rechargeWay: recharge_way,
|
30
|
-
commission: commission
|
31
|
-
}
|
32
|
-
|
33
|
-
res = operate_post(:operate, service, params, :service)
|
34
|
-
|
35
|
-
res
|
36
|
-
end
|
37
|
-
|
38
|
-
end # module
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,32 +0,0 @@
|
|
1
|
-
# coding: utf-8
|
2
|
-
module Lanmao
|
3
|
-
module Api
|
4
|
-
module Query
|
5
|
-
module QueryAuthorizationEntrustPayRecord
|
6
|
-
#
|
7
|
-
# 委托支付授权记录查询
|
8
|
-
#
|
9
|
-
# @return [ Hash ] 结果集
|
10
|
-
# * :result [String] "S"/"F"/"P"
|
11
|
-
# * :request_params [Hash] 请求参数
|
12
|
-
# * :response [Object] 请求返回对象
|
13
|
-
# * :code [String] 结果代码
|
14
|
-
# * :msg [String] 结果信息
|
15
|
-
# * :data: 具体业务返回信息
|
16
|
-
#
|
17
|
-
def query_authorization_entrust_pay_record(flow_id)
|
18
|
-
service = 'QUERY_AUTHORIZATION_ENTRUST_PAY_RECORD'
|
19
|
-
|
20
|
-
params = {
|
21
|
-
requestNo: flow_id,
|
22
|
-
}
|
23
|
-
|
24
|
-
res = operate_post(:query, service, params, :service)
|
25
|
-
|
26
|
-
res
|
27
|
-
end
|
28
|
-
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|