diff --git a/app/jobs/get_bitget_spot_trades_job.rb b/app/jobs/get_bitget_spot_trades_job.rb
new file mode 100644
index 0000000..6629ae9
--- /dev/null
+++ b/app/jobs/get_bitget_spot_trades_job.rb
@@ -0,0 +1,98 @@
+class GetBitgetSpotTradesJob < ApplicationJob
+  queue_as :daily_job
+  SOURCE = 'bitget'.freeze
+  FEE_SYMBOL = 'USDT'.freeze
+
+  def perform(user_id: nil)
+    result = BitgetSpotsService.new.get_orders rescue nil
+    return if result.blank?
+
+    txs = OriginTransaction.where(source: SOURCE, user_id: user_id)
+    ids = []
+
+    OriginTransaction.transaction do
+      result['data'].each do |d|
+        next if d['status'] != 'filled'
+        order_id = d['orderId']
+        next if OriginTransaction.exists?(order_id: order_id, user_id: user_id, source: SOURCE)
+        original_symbol = d['symbol']
+        qty = d['size'].to_f
+        price = d['price'].to_f
+        amount = qty * price
+        trade_type = d['side'].downcase
+        from_symbol = original_symbol.split(FEE_SYMBOL)[0]
+        event_time = Time.at(d['uTime'].to_i)
+        cost = get_spot_cost(user_id, original_symbol, event_time.to_date) || price
+        current_price = get_current_price(original_symbol, user_id, from_symbol)
+        revenue = get_revenue(trade_type, amount, cost, qty, current_price)
+        roi = revenue / amount
+        tx = OriginTransaction.where(order_id: order_id, user_id: user_id, source: SOURCE).first_or_initialize
+        tx.update(
+          original_symbol: original_symbol,
+          from_symbol: from_symbol,
+          to_symbol: FEE_SYMBOL,
+          fee_symbol: FEE_SYMBOL,
+          trade_type: trade_type,
+          price: price,
+          qty: qty,
+          amount: amount,
+          cost: cost,
+          revenue: revenue,
+          roi: roi,
+          current_price: current_price,
+          event_time: event_time
+        )
+        update_tx(tx)
+        ids.push(tx.id)
+      end
+
+      txs.where.not(id: ids).each do |tx|
+        update_tx(tx)
+      end
+    end
+  end
+
+  def get_current_price(symbol, user_id, from_symbol)
+    price = $redis.get("gate_spot_price_#{symbol}").to_f
+    if price == 0
+      price = BitgetSpotsService.new(user_id: user_id).get_price(symbol)['data'].first["lastPr"].to_f rescue 0
+      price = get_coin_price(from_symbol) if price.zero?
+      $redis.set("gate_spot_price_#{symbol}", price, ex: 2.hours)
+    end
+
+    price.to_f
+  end
+
+  def get_coin_price(symbol)
+    date = Date.yesterday
+    url = ENV['COIN_ELITE_URL'] + "/api/coins/history_price?symbol=#{symbol}&from_date=#{date}&to_date=#{date}"
+    response = RestClient.get(url)
+    data = JSON.parse(response.body)
+    data['result'].values[0].to_f rescue nil
+  end
+
+  def update_tx(tx)
+    tx.current_price = get_current_price(tx.original_symbol, tx.user_id, tx.from_symbol)
+    if tx.cost.to_f.zero?
+      tx.cost = get_spot_cost(tx.user_id, tx.original_symbol, tx.event_time.to_date) || tx.price
+    end
+    tx.revenue = get_revenue(tx.trade_type, tx.amount, tx.cost, tx.qty, tx.current_price)
+    tx.roi = tx.revenue / tx.amount
+    tx.save
+  end
+
+  def get_revenue(trade_type, amount, cost, qty, current_price)
+    if trade_type == 'sell'
+      amount - cost * qty
+    else
+      current_price * qty - amount
+    end
+  end
+
+  def get_spot_cost(user_id, origin_symbol, date)
+    cost = SpotBalanceSnapshotRecord.joins(:spot_balance_snapshot_info)
+            .find_by(spot_balance_snapshot_info: {user_id: user_id, event_date: date}, origin_symbol: origin_symbol, source: SOURCE)&.price
+    cost = UserSpotBalance.find_by(user_id: user_id, origin_symbol: origin_symbol, source: SOURCE)&.price if cost.nil? && date == Date.today
+    cost
+  end
+end
diff --git a/app/services/bitget_spots_service.rb b/app/services/bitget_spots_service.rb
index 9aa850b..d0325ae 100644
--- a/app/services/bitget_spots_service.rb
+++ b/app/services/bitget_spots_service.rb
@@ -19,20 +19,21 @@ def initialize(user_id: nil)
     end
   end
 
-  def get_orders(start_time: nil, end_time: DateTime.now)
+  def get_orders
     begin
-      start_time ||= end_time - 2.weeks
-      request_path = "/api/v2/tax/spot-record?endTime=#{end_time.strftime('%Q')}&startTime=#{start_time.strftime('%Q')}"
+      request_path = "/api/v2/spot/trade/history-orders"
       do_request("get", request_path)
     rescue => e
       format_error_msg(e)
     end
   end
 
-  def get_price(instId)
+  def get_price(symbol)
     begin
-      request_path = "/api/v5/market/ticker?instId=#{instId}"
-      do_request("get", request_path)
+      request_path = "/api/v2/spot/market/tickers?symbol=#{symbol}"
+      url = BASE_URL + request_path
+      response = RestClient.get(url)
+      JSON.parse(response)
     rescue => e
       format_error_msg(e)
     end
@@ -41,7 +42,7 @@ def get_price(instId)
   private
   def do_request(method, request_path)
     url = BASE_URL + request_path
-    timestamp = '1685013478665' #get_timestamp
+    timestamp = get_timestamp
     sign = signed_data("#{timestamp}#{method.upcase}#{request_path}")
     headers = {
       "ACCESS-KEY" => @api_key,
@@ -49,10 +50,14 @@ def do_request(method, request_path)
       "ACCESS-TIMESTAMP" => timestamp,
       "ACCESS-PASSPHRASE" => @passphrase,
       "Content-Type" => "application/json",
-      "locale" => "en-US"
+      "locale" => "zh-CN"
     }
 
-    response = RestClient.get(url, headers)
+    begin
+      response = RestClient.get(url, headers)
+    rescue RestClient::ExceptionWithResponse => e
+      e.response
+    end
     JSON.parse(response)
   end
 
@@ -61,7 +66,7 @@ def signed_data(data)
   end
 
   def get_timestamp
-    DateTime.now.strftime('%Q')
+    DateTime.now.strftime('%Q').to_i
   end
 
   def format_error_msg(e)