Ver Fonte

修改gate自定义订单号

gepangpang há 2 anos atrás
pai
commit
ee63845502
2 ficheiros alterados com 6 adições e 6 exclusões
  1. 1 1
      standard/src/gate_handle.rs
  2. 5 5
      standard/src/gate_swap.rs

+ 1 - 1
standard/src/gate_handle.rs

@@ -111,7 +111,7 @@ pub fn format_order_item(order: serde_json::Value, ct_val: Decimal) -> Order {
     };
     let rst_order = Order {
         id: order["id"].to_string(),
-        custom_id: text.replace("t-my-custom-id_", ""),
+        custom_id: text.replace("t-my-custom-id_", "").replace("t-", ""),
         price: Decimal::from_f64(order["price"].as_f64().unwrap()).unwrap(),
         amount,
         deal_amount,

+ 5 - 5
standard/src/gate_swap.rs

@@ -313,7 +313,7 @@ impl Platform for GateSwap {
     async fn get_order_detail(&mut self, order_id: &str, custom_id: &str) -> Result<Order, Error> {
         let symbol_array: Vec<&str> = self.symbol.split("_").collect();
         let ct_val = self.market.ct_val;
-        let id = if order_id.eq("") { format!("t-my-custom-id_{}", custom_id) } else { order_id.to_string() };
+        let id = if order_id.eq("") { format!("t-{}", custom_id) } else { order_id.to_string() };
         let res_data = self.request.get_order_details(symbol_array[1].to_string().to_lowercase(), id).await;
         if res_data.code == "200" {
             let res_data_str = &res_data.data;
@@ -344,7 +344,7 @@ impl Platform for GateSwap {
         let symbol_array: Vec<&str> = self.symbol.split("_").collect();
         let ct_val = self.market.ct_val;
         let mut params = json!({
-            "text": format!("t-my-custom-id_{}", custom_id),
+            "text": format!("t-{}", custom_id),
             "contract": self.symbol.to_string(),
             "price": price.to_string(),
         });
@@ -385,7 +385,7 @@ impl Platform for GateSwap {
     async fn take_order_symbol(&mut self, symbol: String, ct_val: Decimal, custom_id: &str, origin_side: &str, price: Decimal, amount: Decimal) -> Result<Order, Error> {
         let symbol_array: Vec<&str> = symbol.split("_").collect();
         let mut params = json!({
-            "text": format!("t-my-custom-id_{}", custom_id),
+            "text": format!("t-{}", custom_id),
             "contract": self.symbol.to_string(),
             "price": price.to_string(),
         });
@@ -428,7 +428,7 @@ impl Platform for GateSwap {
         let symbol_array: Vec<&str> = self.symbol.split("_").collect();
         let ct_val = self.market.ct_val;
         let settle = symbol_array[1].to_string().to_lowercase();
-        let id = if order_id.eq("") { format!("t-my-custom-id_{}", custom_id) } else { order_id.to_string() };
+        let id = if order_id.eq("") { format!("t-{}", custom_id) } else { order_id.to_string() };
         let res_data = self.request.cancel_order(settle, id.to_string()).await;
         if res_data.code == "200" {
             let res_data_str = &res_data.data;
@@ -678,7 +678,7 @@ pub fn format_order_item(order: serde_json::Value, ct_val: Decimal) -> Order {
     };
     let rst_order = Order {
         id: order["id"].to_string(),
-        custom_id: text.replace("t-my-custom-id_", ""),
+        custom_id: text.replace("t-my-custom-id_", "").replace("t-", ""),
         price: Decimal::from_str(order["price"].as_str().unwrap()).unwrap(),
         amount,
         deal_amount,