model修改

strategy/src/model.rs

@@ -2,7 +2,7 @@ use std::collections::{HashMap};
 use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Position{
+pub struct LocalPosition{
     // 做多仓位
     pub long_pos: Decimal,
     // 做空仓位
@@ -13,9 +13,9 @@ pub struct Position{
     pub short_avg: Decimal
 }
 
-impl Position {
-    pub fn new() -> Position {
-        Position{
+impl LocalPosition {
+    pub fn new() -> LocalPosition {
+        LocalPosition{
             long_pos: dec!(0),
             short_pos: dec!(0),
             long_avg: dec!(0),
@@ -26,7 +26,7 @@ impl Position {
 
 #[derive(Debug)]
 pub struct TraderMsg{
-    pub position: Position,
+    pub position: LocalPosition,
     pub cash: Decimal,
     pub coin: Decimal,
     pub orders: HashMap<String, OrderInfo>,
@@ -38,7 +38,7 @@ pub struct TraderMsg{
 impl TraderMsg {
     pub fn new() -> TraderMsg {
         TraderMsg{
-            position: Position {
+            position: LocalPosition {
                 long_pos: Default::default(),
                 short_pos: Default::default(),
                 long_avg: Default::default(),

strategy/src/strategy.rs

@@ -5,7 +5,7 @@ use chrono::Utc;
 use rust_decimal::Decimal;
 use rust_decimal::prelude::{FromPrimitive, ToPrimitive};
 use rust_decimal_macros::dec;
-use crate::model::{OrderCommand, OrderInfo, Position, TraderMsg};
+use crate::model::{LocalPosition, OrderCommand, OrderInfo, TraderMsg};
 use crate::params::Params;
 use crate::utils;
 use tracing::{info, instrument, subscriber, error, debug};
@@ -48,7 +48,7 @@ pub struct Strategy {
     pub ref_name: Vec<String>,                                      //
     pub maker_mode: String,                                         //
     pub local_orders: HashMap<String, OrderInfo>,                   // 本地订单
-    pub pos: Position,                                              //
+    pub pos: LocalPosition,                                              //
     pub long_hold_value: Decimal,                                   //
     pub short_hold_value: Decimal,                                  //
     pub equity: Decimal,                                            //
@@ -144,7 +144,7 @@ impl Strategy {
             ref_name: vec![],
             maker_mode: "free".to_string(),
             local_orders: Default::default(),
-            pos: Position {
+            pos: LocalPosition {
                 long_pos: Default::default(),
                 short_pos: Default::default(),
                 long_avg: Default::default(),