lib/huobi_client/client.rb in huobi_client-0.1.0 vs lib/huobi_client/client.rb in huobi_client-0.1.1

@@ -73,22 +73,22 @@
     def hadax_balance(account_id: @account_id)
       get "/v1/hadax/account/accounts/#{account_id}/balance"
     end
 
     # 交易API
-    def place(account_id:, symbol:, type:, amount:, price: nil, source: 'api') # Pro站下单
+    def place(account_id: @account_id, symbol:, type:, amount:, price: nil, source: 'api') # Pro站下单
       # types
       # buy-market：市价买,
       # sell-market：市价卖,
       # buy-limit：限价买,
       # sell-limit：限价卖,
       # buy-ioc：IOC买单,
       # sell-ioc：IOC卖单
       post '/v1/order/orders/place', fun_params(__method__, binding).transform_keys {|key| key.to_s.sub('_', '-')}
     end
 
-    def hadax_place(account_id:, symbol:, type:, amount:, price: nil, source: 'api') # HADAX站下单
+    def hadax_place(account_id: @account_id, symbol:, type:, amount:, price: nil, source: 'api') # HADAX站下单
       post '/v1/hadax/order/orders/place', fun_params(__method__, binding).transform_keys {|key| key.to_s.sub('_', '-')}
     end
 
     def submit_cancel(order_id:) # 申请撤销一个订单请求
       post "/v1/order/orders/#{order_id}/submitcancel"
@@ -96,25 +96,25 @@
 
     def batch_cancel(order_ids:) # 批量撤销订单
       post '/v1/order/orders/batchcancel', fun_params(__method__, binding).transform_keys {|key| key.to_s.sub('_', '-')}
     end
 
-    def order_detail # 查询某个订单详情
-      get "/v1/order/orders/#{options[:order_id]}"
+    def order_detail(order_id:) # 查询某个订单详情
+      get "/v1/order/orders/#{order_id}"
     end
 
-    def match_results # 查询某个订单的成交明细
-      get "/v1/order/orders/#{options[:order_id]}/matchresults"
+    def match_results(order_id:) # 查询某个订单的成交明细
+      get "/v1/order/orders/#{order_id}/matchresults"
     end
 
-    def orders(symbol:, states:, types: nil, start_date: nil, end_date: nil, from: nil, direct: nil, size: nil) # 查询当前委托、历史委托
+    def orders(symbol: nil, states:, types: nil, start_date: nil, end_date: nil, from: nil, direct: nil, size: nil) # 查询当前委托、历史委托
       # direct	false	string	查询方向		prev 向前，next 向后
       # states	true	string	查询的订单状态组合，使用','分割		pre-submitted 准备提交, submitted 已提交, partial-filled 部分成交, partial-canceled 部分成交撤销, filled 完全成交, canceled 已撤销
       get '/v1/order/orders', fun_params(__method__, binding).transform_keys {|key| key.to_s.sub('_', '-')}
     end
 
-    def all_match_results(symbol:, states:, types: nil, start_date: nil, end_date: nil, from: nil, direct: nil, size: nil) # 查询当前成交、历史成交
+    def all_match_results(symbol: nil, states:, types: nil, start_date: nil, end_date: nil, from: nil, direct: nil, size: nil) # 查询当前成交、历史成交
       get '/v1/order/matchresults', fun_params(__method__, binding).transform_keys {|key| key.to_s.sub('_', '-')}
     end
 
     # 借贷交易API （重要：如果使用借贷资产交易，请在下单接口/v1/order/orders/place请求参数source中填写‘margin-api’）
 
@@ -128,11 +128,11 @@
 
     def margin_apply(symbol:, currency:, amount:) # 申请借贷
       post '/v1/margin/orders', fun_params(__method__, binding)
     end
 
-    def margin_repay(amount:) # 归还借贷
-      post "/v1/margin/orders/#{options[order_id]}/repay", fun_params(__method__, binding)
+    def margin_repay(amount:, order_id:) # 归还借贷
+      post "/v1/margin/orders/#{order_id}/repay", fun_params(__method__, binding)
     end
 
     def loan_orders(symbol:, states: nil, start_date: nil, end_date: nil, from: nil, direct: nil, size: nil) # 借贷订单
       get '/v1/margin/loan-orders', fun_params(__method__, binding).transform_keys {|key| key.to_s.sub('_', '-')}
     end