Update

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.MTPClient.Analysis/ViewModels/CChartViewModel.cs

@@ -838,7 +838,9 @@ namespace Muchinfo.MTPClient.Analysis.ViewModels
             if (!isUpdate)
             {
                 ////图表 参数2是分时图
-                _financeChart.CreateChartView2(_controlHandle, goods.GoodsCode, (int)_chartCycleType, exchange);
+                //_financeChart.CreateChartView2(_controlHandle, goods.GoodsCode, (int)_chartCycleType, exchange);
+                // 要使用的OutGoodsCode查历史数据（暂时大写处理）
+                _financeChart.CreateChartView2(_controlHandle, goods.GoodsCode.ToUpper(), (int)_chartCycleType, exchange);
                 isUpdate = true;
                 RegisterMessage();
                 _financeChart.PostFrameMessage(_controlHandle, (int)UserDefineWindowsMessage.SetSacle,

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.TASClient.Trade/ViewModels/ChannelTradeViewMode.cs

@@ -74,7 +74,9 @@ namespace Muchinfo.MTPClient.Trade.ViewModels
         private void ChannelMarketInit(Direction direction)
         {
             //默认使用市价 fixme 没有市价，就默认显示超价
-            CurrentChannelPriceMode = ApplicationParameter.CanMarketPrice(CurrentGoods) ? ChannelPriceMode.MarketPrice : ChannelPriceMode.SuperPrice;
+            //CurrentChannelPriceMode = ApplicationParameter.CanMarketPrice(CurrentGoods) ? ChannelPriceMode.MarketPrice : ChannelPriceMode.SuperPrice;
+            CurrentChannelPriceMode = ChannelPriceMode.MatchPrice;
+
             CurrentSPSLOrderType = SPSLOrderType.SLOrder;
             //SetEntrustPriceRange();
 

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Modules/Muchinfo.TASClient.Trade/ViewModels/TradeBaseViewModel.cs

@@ -2269,9 +2269,9 @@ namespace Muchinfo.MTPClient.Trade.ViewModels
 
                 var dic2 = new Dictionary<ChannelPriceMode, string> // 不支持市价
                 {
-                    {ChannelPriceMode.LastestPrice, ChannelPriceMode.LastestPrice.Discription()},
+                    //{ChannelPriceMode.LastestPrice, ChannelPriceMode.LastestPrice.Discription()},
                     {ChannelPriceMode.MatchPrice, ChannelPriceMode.MatchPrice.Discription()},
-                    {ChannelPriceMode.SuperPrice, ChannelPriceMode.SuperPrice.Discription()},
+                    //{ChannelPriceMode.SuperPrice, ChannelPriceMode.SuperPrice.Discription()},
                     {ChannelPriceMode.LimitPrice, ChannelPriceMode.LimitPrice.Discription()},
                 };
 

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient.UI/Utilities/MessageRegister.cs

@@ -325,15 +325,16 @@ namespace Muchinfo.MTPClient.UI.Utilities
         /// <param name="isUnforceUpdate">if set to <c>true</c> [is unforce update].</param>
         private static void ShowModifyPwdDialog(bool isUnforceUpdate)
         {
-            Application.Current.Dispatcher.BeginInvoke(new Action(() =>
-            {
-                var view = new TradePWDModifyView(isUnforceUpdate)
-                {
-                    Owner = Application.Current.MainWindow,
-                    WindowStartupLocation = WindowStartupLocation.CenterOwner
-                };
-                view.ShowDialog();
-            }));
+            // 风管云平台不需要修改密码
+            //Application.Current.Dispatcher.BeginInvoke(new Action(() =>
+            //{
+            //    var view = new TradePWDModifyView(isUnforceUpdate)
+            //    {
+            //        Owner = Application.Current.MainWindow,
+            //        WindowStartupLocation = WindowStartupLocation.CenterOwner
+            //    };
+            //    view.ShowDialog();
+            //}));
         }
 
         /// <summary>

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient.UI/ViewModels/HomeViewModel.cs

@@ -1379,7 +1379,7 @@ namespace Muchinfo.MTPClient.UI.ViewModels
             //查询交易端配置的菜单--菜单权限从服务端不使用缓存
             ulong menuUTime = CacheManager.GetLastUpdateTimeBy(Muchinfo.MTPClient.Data.Enums.LastUpdateTimeType.MenuUTime);
             _loginService.QueryAccountFuncMenu(menuUTime, midParam, FuncMenusSuccess, FuncMenusErrorFunc);
-            
+
             //改成串行下载数据
             /*
             ////查询商品组信息

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient/App.xaml.cs

@@ -81,6 +81,7 @@ namespace Muchinfo.MTPClient
             //读取系统配置
             ApplicationParameter.InitializeSystemConfig();
 
+            // 风管云平台服务地址
             ApplicationParameter.UpdateErmcpParamete();
 
             base.OnStartup(e);

Muchinfo.MTPClient/Fx4.0/Main/03.UI/Muchinfo.TASClient/Config/Config.xml

@@ -5,8 +5,8 @@
   <BizAddress>192.168.20.151:35001</BizAddress>
   <QuoteAddress>192.168.20.151:35002</QuoteAddress>-->
   
-  <!--<BizAddress>192.168.20.152:32001</BizAddress>
-  <QuoteAddress>192.168.20.152:32002</QuoteAddress>-->
+  <BizAddress>192.168.31.175:5001</BizAddress>
+  <QuoteAddress>192.168.31.175:5002</QuoteAddress>
     <!--uat外网环境-->
   <!--<BizAddress>103.40.249.124:6010</BizAddress>
   <QuoteAddress>103.40.249.124:6020</QuoteAddress>-->
@@ -81,7 +81,7 @@
     <!--是否支持快捷反手-->
     <CanUseBackHandOpen>1</CanUseBackHandOpen>
     <!--是否支持快捷锁仓-->
-    <CanUseQuickLockOrder>1</CanUseQuickLockOrder>
+    <CanUseQuickLockOrder>0</CanUseQuickLockOrder>
     <!--获取公网ip地址的地址 | 后面表示编码类型-->
     <PublishNetIpAddress>http://www.net.cn/static/customercare/yourip.asp|gbk</PublishNetIpAddress>
   </Config>

Muchinfo.MTPClient/Fx4.0/Main/04.Infrastructure/Muchinfo.TASClient.Infrastructure/EntityHelpers/QuoteDatagramHelper.cs

@@ -124,7 +124,9 @@ namespace Muchinfo.MTPClient.Infrastructure.EntityHelpers
                         //item.ExchHqCode = "255";//暂时固定BY DK
                         byte exchangeCode = Convert.ToByte(item.ExchHqCode.Substring(0, 3));
                         byte state = 0;
-                        string goodsCode = item.GoodsHqCode.PadRight(64, '\0');
+                        // 风管行情订阅要使用OutGoodsCode，即大写；这里暂时直接转大写订阅
+                        //string goodsCode = item.GoodsHqCode.PadRight(64, '\0');
+                        string goodsCode = item.GoodsHqCode.ToUpper().PadRight(64, '\0');
                         SubGoods agoods = new SubGoods
                         {
                             State = state,
@@ -179,6 +181,7 @@ namespace Muchinfo.MTPClient.Infrastructure.EntityHelpers
 
                 var roundInt = 0;
                 var item = CacheManager.CacheGoodsBaseInfos.FirstOrDefault(z => z.Symbol.ToUpper() == goods.Symbol.ToUpper());
+                //var item = CacheManager.CacheGoodsBaseInfos.FirstOrDefault(z => z.GoodsCode.ToUpper() == goods.GoodsCode.ToUpper());
                 int buySub = 0, sellSub = 0;
                 if (item != null)
                 {
@@ -644,6 +647,8 @@ namespace Muchinfo.MTPClient.Infrastructure.EntityHelpers
             foreach (var realTimeGoods in quoteList)
             {
                 var quoteGoods = CacheManager.CacheGoodsBaseInfos.FirstOrDefault((goods) => goods.Symbol.ToUpper() == realTimeGoods.Symbol.ToUpper());
+                //var quoteGoods = CacheManager.CacheGoodsBaseInfos.FirstOrDefault((goods) => goods.GoodsCode.ToUpper() == realTimeGoods.GoodsCode.ToUpper());
+                // Console.WriteLine(realTimeGoods.Symbol.ToUpper() + "    " + quoteGoods == null ? "NULL" : quoteGoods.GoodsCode);
                 if (quoteGoods == null) continue;
 
                 quoteGoods.UpdateFrom(realTimeGoods, IsHistory);

Muchinfo.MTPClient/Fx4.0/Main/04.Infrastructure/Muchinfo.TASClient.Infrastructure/Utilities/UserManager.cs

@@ -974,12 +974,17 @@ namespace Muchinfo.MTPClient.Infrastructure.Utilities
                 Monitor.Enter(lockObject, ref lockToken);
                 var userConfigs = JsonHelper.LoadData<UserConfig>(_userConfigFile);
                 var userConfig = userConfigs.FirstOrDefault() ?? new UserConfig();
-                if (userConfig.QuoteGridHeaders == null) userConfig.QuoteGridHeaders = new Dictionary<QuoteListHeaderType, List<QuoteListHeader>>();
+                if (userConfig.QuoteGridHeaders == null)
+                    userConfig.QuoteGridHeaders = new Dictionary<QuoteListHeaderType, List<QuoteListHeader>>();
                 userConfig.QuoteGridHeaders[type] = headers;
 
                 userConfig.ConfigHeadersVer = SaveHeaderVer(type, userConfig.ConfigHeadersVer); ////保存版本号
                 //只存一个集合，每次覆盖
-                JsonHelper.SaveData<UserConfig>(_userConfigFile, new List<UserConfig>() { userConfig }, null, true);   
+                JsonHelper.SaveData<UserConfig>(_userConfigFile, new List<UserConfig>() {userConfig}, null, true);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
             }
             finally
             {

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/Abstract/AccountAdapter.cs

@@ -171,7 +171,7 @@ namespace Muchinfo.MTPClient.Adapter.Abstract
         /// <returns></returns>
         public abstract ResponeEntity<TradeAccount> ToLocalLoginEntity(object obj);
 
-        public abstract byte[] ToReqeustLogin(int loginType, string passWord, ulong loginID, string guid, string loginIP, string systemDesc,string version);
+        public abstract byte[] ToReqeustLogin(int loginType, string passWord, ulong loginID, string guid, string loginIP, string systemDesc, string version, byte[] clientSystemInfo, string clientAppID);
 
         public abstract byte[] ToReqeustLogOut(ulong loginID);
 

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/Abstract/OrderAdapter.cs

@@ -127,7 +127,7 @@ namespace Muchinfo.MTPClient.Adapter.Abstract
         /// <param name="entrustOrder"></param>
         /// <param name="userID"></param>
         /// <returns></returns>
-       public abstract byte[] ToChannnelEntrustOrder(NewEntrustOrder entrustOrder, uint userID);
+       public abstract byte[] ToChannnelEntrustOrder(NewEntrustOrder entrustOrder, uint userID, ulong clientId);
 
        /// <summary>
        /// 通道SPSL下单转换

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/Data/tas.cs

@@ -470,6 +470,24 @@ namespace tas
       get { return _LoginCode; }
       set { _LoginCode = value; }
     }
+
+    private byte[] _ClientSystemInfo = null;
+    [global::ProtoBuf.ProtoMember(14, IsRequired = false, Name=@"ClientSystemInfo", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue(null)]
+    public byte[] ClientSystemInfo
+    {
+      get { return _ClientSystemInfo; }
+      set { _ClientSystemInfo = value; }
+    }
+
+    private string _ClientAppID = "";
+    [global::ProtoBuf.ProtoMember(15, IsRequired = false, Name=@"ClientAppID", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue("")]
+    public string ClientAppID
+    {
+      get { return _ClientAppID; }
+      set { _ClientAppID = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -622,6 +640,24 @@ namespace tas
       get { return _LoginCode; }
       set { _LoginCode = value; }
     }
+
+    private byte[] _ClientSystemInfo = null;
+    [global::ProtoBuf.ProtoMember(17, IsRequired = false, Name=@"ClientSystemInfo", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue(null)]
+    public byte[] ClientSystemInfo
+    {
+      get { return _ClientSystemInfo; }
+      set { _ClientSystemInfo = value; }
+    }
+
+    private ulong _ClientID = uint.MaxValue;
+    [global::ProtoBuf.ProtoMember(18, IsRequired = false, Name=@"ClientID", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
+    [global::System.ComponentModel.DefaultValue(uint.MaxValue)]
+    public ulong ClientID
+    {
+      get { return _ClientID; }
+      set { _ClientID = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -7703,6 +7739,15 @@ namespace tas
       get { return _OperatorID; }
       set { _OperatorID = value; }
     }
+
+    private string _IP = "";
+    [global::ProtoBuf.ProtoMember(10, IsRequired = false, Name=@"IP", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue("")]
+    public string IP
+    {
+      get { return _IP; }
+      set { _IP = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -7903,6 +7948,15 @@ namespace tas
       get { return _CloseType; }
       set { _CloseType = value; }
     }
+
+    private string _IP = "";
+    [global::ProtoBuf.ProtoMember(16, IsRequired = false, Name=@"IP", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue("")]
+    public string IP
+    {
+      get { return _IP; }
+      set { _IP = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -10604,6 +10658,15 @@ namespace tas
       get { return _CloseType; }
       set { _CloseType = value; }
     }
+
+    private string _IP = "";
+    [global::ProtoBuf.ProtoMember(14, IsRequired = false, Name=@"IP", DataFormat = global::ProtoBuf.DataFormat.Default)]
+    [global::System.ComponentModel.DefaultValue("")]
+    public string IP
+    {
+      get { return _IP; }
+      set { _IP = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }
@@ -14553,6 +14616,15 @@ namespace tas
       get { return _ExChangeAmount; }
       set { _ExChangeAmount = value; }
     }
+
+    private double _ExClosePL = int.MinValue;
+    [global::ProtoBuf.ProtoMember(8, IsRequired = false, Name=@"ExClosePL", DataFormat = global::ProtoBuf.DataFormat.TwosComplement)]
+    [global::System.ComponentModel.DefaultValue(int.MinValue)]
+    public double ExClosePL
+    {
+      get { return _ExClosePL; }
+      set { _ExClosePL = value; }
+    }
     private global::ProtoBuf.IExtension extensionObject;
     global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
       { return global::ProtoBuf.Extensible.GetExtensionObject(ref extensionObject, createIfMissing); }

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/Json/AccountJsonAdapter.cs

@@ -47,7 +47,7 @@ namespace Muchinfo.MTPClient.Adapter.Json
             throw new NotImplementedException();
         }
 
-        public override byte[] ToReqeustLogin(int loginType, string passWord, ulong loginID, string guid, string loginIP, string systemDesc, string version)
+        public override byte[] ToReqeustLogin(int loginType, string passWord, ulong loginID, string guid, string loginIP, string systemDesc, string version, byte[] clientSystemInfo, string clientAppID)
         {
             throw new NotImplementedException();
         }

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/ProtoBuf/AccountProtobufAdapter.cs

@@ -933,8 +933,12 @@ namespace Muchinfo.MTPClient.Adapter.ProtoBuf
                     PwdWrongCnt = loginRsq.PwdWrongCnt,
                     PwdWrongLockCnt = loginRsq.PwdWrongLockCnt,
                     LoginLockHourNum = loginRsq.LoginLockHourNum,
+
+                    ClientSystemInfo = loginRsq.ClientSystemInfo,
+                    ClientId = loginRsq.ClientID
                 }
             };
+            
             if (loginRsq.Header != null && loginRsq.RetCode == 0)
             {
                 loginRsq.Header.UserID = loginRsq.UserID;
@@ -955,7 +959,7 @@ namespace Muchinfo.MTPClient.Adapter.ProtoBuf
         /// <param name="loginIP">login IP Address.</param>
         /// <param name="systemDesc">The system desc.</param>
         /// <returns>System.Byte[][].</returns>
-        public override byte[] ToReqeustLogin(int loginType, string passWord, ulong loginID, string guid, string loginIP, string systemDesc, string version)
+        public override byte[] ToReqeustLogin(int loginType, string passWord, ulong loginID, string guid, string loginIP, string systemDesc, string version, byte[] clientSystemInfo, string clientAppID)
         {
             var loginReq = new LoginReq()
               {
@@ -970,6 +974,8 @@ namespace Muchinfo.MTPClient.Adapter.ProtoBuf
 
                   EnvironmentInfo = systemDesc,
 
+                  ClientSystemInfo = clientSystemInfo,
+                  ClientAppID = clientAppID,
               };
             var uuid = Guid.NewGuid();
             loginReq.Header = new MessageHead() { UUID = uuid.ToString() };

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Adapter/ProtoBuf/OrderProtoBufAdapter.cs

@@ -512,7 +512,7 @@ namespace Muchinfo.MTPClient.Adapter.ProtoBuf
         /// <param name="entrustOrder"></param>
         /// <param name="userID"></param>
         /// <returns></returns>
-        public override byte[] ToChannnelEntrustOrder(NewEntrustOrder entrustOrder, uint userID)
+        public override byte[] ToChannnelEntrustOrder(NewEntrustOrder entrustOrder, uint userID, ulong clientId)
         {
             var marketOrder = new ChannelOrderReq()
             {
@@ -542,7 +542,8 @@ namespace Muchinfo.MTPClient.Adapter.ProtoBuf
                         MarketID = entrustOrder.MarketId,
                         UserID = userID,
                         GoodsID = entrustOrder.GoodsId,
-                        UUID = Guid.NewGuid().ToString()
+                        UUID = Guid.NewGuid().ToString(),
+                        AccountID2 = clientId,
                     },
                 IP = entrustOrder.Ip,
             };

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Data/Enums/eSystemMenuValue.cs

@@ -69,15 +69,15 @@ namespace Muchinfo.MTPClient.Data.Enums
                     }
                 },
 
-                new SysMenuItem("公告通知", MenuCommandType.NoticeInform)
-                {
-                    FuncMenuCode = noticeInfoMenuCode,
-                    SortId = 9999,
-                    Children = new List<SysMenuItem>()
-                    {
-                        new SysMenuItem("公告", MenuCommandType.Notice){ParentFuncMenuCode =tradeMenuCode , FuncMenuCode ="L00200010000"},
-                    }
-                },
+                //new SysMenuItem("公告通知", MenuCommandType.NoticeInform)
+                //{
+                //    FuncMenuCode = noticeInfoMenuCode,
+                //    SortId = 9999,
+                //    Children = new List<SysMenuItem>()
+                //    {
+                //        new SysMenuItem("公告", MenuCommandType.Notice){ParentFuncMenuCode =tradeMenuCode , FuncMenuCode ="L00200010000"},
+                //    }
+                //},
             };
         }
 
@@ -103,18 +103,18 @@ namespace Muchinfo.MTPClient.Data.Enums
                         new SysMenuItem("委托单", MenuCommandType.EntrustOrder){ParentFuncMenuCode =queryMenuCode , FuncMenuCode ="T00500130000"},
                         new SysMenuItem("成交明细", MenuCommandType.TransactionOrder){ParentFuncMenuCode =queryMenuCode , FuncMenuCode ="T00500140000"},
                         new SysMenuItem("持仓汇总", MenuCommandType.Position){ParentFuncMenuCode =queryMenuCode , FuncMenuCode ="T00500150000"},
-                        new SysMenuItem("止盈止损", MenuCommandType.SPSLOrder){ParentFuncMenuCode =queryMenuCode , FuncMenuCode ="T00500170000"},
+                        //new SysMenuItem("止盈止损", MenuCommandType.SPSLOrder){ParentFuncMenuCode =queryMenuCode , FuncMenuCode ="T00500170000"},
                     }
                 },
 
-                new SysMenuItem("报表", MenuCommandType.Report)
-                {
-                    FuncMenuCode = reportMenuCode,
-                    Children = new List<SysMenuItem>()
-                    {
-                        new SysMenuItem("结算单", MenuCommandType.ReckonReport){ParentFuncMenuCode =reportMenuCode , FuncMenuCode ="T01500010000"},
-                    }
-                },
+                //new SysMenuItem("报表", MenuCommandType.Report)
+                //{
+                //    FuncMenuCode = reportMenuCode,
+                //    Children = new List<SysMenuItem>()
+                //    {
+                //        new SysMenuItem("结算单", MenuCommandType.ReckonReport){ParentFuncMenuCode =reportMenuCode , FuncMenuCode ="T01500010000"},
+                //    }
+                //},
             };
         }
 

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Data/Model/Account/TradeAccount.cs

@@ -451,6 +451,15 @@ namespace Muchinfo.MTPClient.Data.Model.Account
         /// <value>The login lock hour number.</value>
         public uint LoginLockHourNum { get; set; }
 
+        /// <summary>
+        /// 终端系统信息
+        /// </summary>
+        public byte[] ClientSystemInfo { get; set; }
+
+        /// <summary>
+        /// 终端ID(登陆服务分配，用于通道交易关联链路)
+        /// </summary>
+        public ulong ClientId { get; set; }
 
         #endregion
 

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Service/ErmcpService.cs

@@ -5,6 +5,9 @@ using System.Text;
 
 namespace Muchinfo.MTPClient.Service
 {
+    /// <summary>
+    /// 风管云平台专用服务
+    /// </summary>
     class ErmcpService
     {
         

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Service/LoginService.cs

@@ -486,6 +486,10 @@ namespace Muchinfo.MTPClient.Service
                             responeEntrity.Entity.TradeAccount.LoginLockHourNum = UserManager.CurrentTradeAccount.LoginLockHourNum;
                             responeEntrity.Entity.TradeAccount.RiskRatioCalcMode = UserManager.CurrentTradeAccount.RiskRatioCalcMode;
 
+                            responeEntrity.Entity.TradeAccount.ClientId = UserManager.CurrentTradeAccount.ClientId;
+                            responeEntrity.Entity.TradeAccount.ClientSystemInfo =
+                                UserManager.CurrentTradeAccount.ClientSystemInfo;
+
                         }
                         //资金信息单独查询
                         if (responeEntrity.Entity.TAAccountList != null && responeEntrity.Entity.TAAccountList.Any())
@@ -550,7 +554,8 @@ namespace Muchinfo.MTPClient.Service
         /// <returns>返回码：0为成功，其它为失败</returns>
         public void TradeAccountLogin(LoginType loginType, ulong loginID, string phoneUserName, string password, Action<TradeAccount> action, Action<ErrorEntity> errorAction)
         {
-            var reqeust = _accountAdapter.ToReqeustLogin((int)loginType, password, loginID, ApplicationParameter.LoginGuid, IPHelper.GetMACAddress(), string.Empty, ApplicationParameter.Version);
+            var appId = "muchinfo_mtpclient_5.0.1";
+            var reqeust = _accountAdapter.ToReqeustLogin((int)loginType, password, loginID, ApplicationParameter.LoginGuid, IPHelper.GetMACAddress(), string.Empty, ApplicationParameter.Version, new byte[128], appId);
             LogInfoHelper.WriteInfo("登陆请求ToString：" + System.Text.Encoding.UTF8.GetString(reqeust) + "Guid.NewGuid():" + Guid.NewGuid());
             var packgage = new TCPPackage() { Content = reqeust, FunCode = FuncCode.FID_LoginReq };
 

Muchinfo.MTPClient/Fx4.0/Main/05.Services/Muchinfo.TASClient.Service/OrderService.cs

@@ -1142,7 +1142,10 @@ namespace Muchinfo.MTPClient.Service
         public void ChannelEntrustOrder(NewEntrustOrder entrustOrder, Action<OrderDetail> successAction, Action<ErrorEntity> errorAction)
         {
             var userId = UserManager.CurrentTradeAccount.CustomerId;
-            var reqeust = _orderAdapter.ToChannnelEntrustOrder(entrustOrder, userId);
+
+            var clientId = UserManager.CurrentTradeAccount.ClientId; 
+
+            var reqeust = _orderAdapter.ToChannnelEntrustOrder(entrustOrder, userId, clientId);
             var packgage = new TCPPackage() { Content = reqeust, FunCode = FuncCode.FID_ChannelOrderReq };
             LinkManager.Instance.TradeTcpLinkProxy.SendPackage(packgage, new Action<TCPPackage>((revPackgage) =>
             {