update

src/hooks/account/index.ts

@@ -212,9 +212,9 @@ function calcCapitalValue(account: Taaccount, positionList: TradePosition[]) {
 
     // 计算冻结资金
     const freezeAmount = computed(() => {
-        const { otherfreezemargin, outamountfreeze, freezecharge } = account;
-        // 冻结资金 = 手续费冻结 + 出金冻结 + 其他冻结保证金
-        return freezecharge + outamountfreeze + otherfreezemargin;
+        const { freezemargin, otherfreezemargin, outamountfreeze, freezecharge } = account;
+        // 冻结资金 = 冻结保证金 + 手续费冻结 + 出金冻结 + 其他冻结保证金
+        return freezemargin + freezecharge + outamountfreeze + otherfreezemargin;
     })
 
     // 计算风险净值

src/services/proto/futures/index.ts

@@ -1,5 +1,6 @@
 import { ChannelOrderReq, ChannelOrderRsp } from "./interface";
 import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
+import { getLoginData } from '@/services/bus/login'
 
 /**
  * 期货交易委托请求
@@ -8,6 +9,7 @@ import { protoMiddleware } from "@/services/socket/protobuf/buildReq";
 export const channelOrderReq = (param: ChannelOrderReq): Promise<ChannelOrderRsp> => {
     return protoMiddleware<ChannelOrderReq>(param, 'ChannelOrderReq', 'ChannelOrderRsp', {
         AccountID: param.AccountID,
+        AccountID2: getLoginData().ClientID ?? 0,
         MarketID: param.MarketID,
         GoodsID: param.MarketID,
     })

src/services/socket/login/interface/loginQuery.ts

@@ -29,6 +29,7 @@ export interface LoginResponse extends checkTokenRes {
 
 export interface checkTokenRes {
     AccountIDs: any[];
+    ClientID: any;
     Header: Header;
     LoginID: LongType;
     LoginUserType: number;