commit proto接口修改

public/proto/mtp.proto

@@ -848,7 +848,7 @@ message GldSpotContractInfo {
 	optional double PricedAmount = 30; // double 已定价金额
 	optional uint64 SpotGoodsBrandID = 31; // uint64 现货品牌ID
 	optional string Remark = 32; // string 合同备注
-	optional uint64 SaleUserID = 33; // uint64 业务员IDSpotContractOperateReq
+	optional uint64 SaleUserID = 33; // uint64 业务员ID
 	optional uint64 AccountID = 34; // uint64 期货账户ID
 	optional uint32 BizType = 35; // uint32 业务类型 - 1:套保 2:套利
 	optional uint32 CurrencyID = 36; // uint32 结算币种ID
@@ -938,7 +938,7 @@ message SpotContractOperateReq {
 	optional uint64 SpotContractID = 2; // uint64 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
 	optional uint32 OperateType = 3; // uint32 操作类型-1:保存草稿2:提交申请3:审核通过4:审核拒绝5:撤回6:正常完结7:异常终止
 	optional uint32 OperateSrc = 4; // uint32 操作来源-1:管理端2:终端
-	optional uint64 UserID = 5; // uint64 操作用户ID
+	optional uint64 OperatorID = 5; // uint64 操作用户ID
 	optional string Remark = 6; // string 操作备注
 	optional string ClientTicket = 7; // string 客户端流水号
 	optional SpotContractInfo Info = 8; // SpotContractInfo 现货合同信息
@@ -1038,7 +1038,7 @@ message ContractOperateApplyReq {
 	optional uint64 OperateApplyID = 2; // uint64 操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
 	optional uint32 OperateType = 3; // uint32 操作类型-1:登记2:确认3：拒绝4：撤销
 	optional uint32 OperateSrc = 4; // uint32 操作来源-1:管理端2:终端
-	optional uint64 UserID = 5; // uint64 操作用户ID
+	optional uint64 OperatorID = 5; // uint64 操作用户ID
 	optional string Remark = 6; // string 备注
 	optional string ClientTicket = 7; // string 客户端流水号
 	optional ContractOperateApplyInfo Info = 8; // ContractOperateApplyInfo 合同操作信息

src/services/proto/contract/index.ts

@@ -27,7 +27,7 @@ export const operationContractReq = (param: ErmcpContractOperateApplyReq): Promi
  */
 export const contractOperateApply = (param: ContractOperateApplyReq): Promise<any> => {
     param.OperateSrc = 2
-    param.UserID = Number(getLongTypeLoginID())
+    param.OperatorID = Number(getLongTypeLoginID())
     param.ClientTicket = getUUID()
     param.OperateApplyID = getTimeValue()
     return protoMiddleware<ContractOperateApplyReq>(param , 'ContractOperateApplyReq', 'ContractOperateApplyRsp', 2)

src/services/proto/contract/interface.ts

@@ -36,7 +36,7 @@ export interface ContractOperateApplyReq {
     Info?: ContractOperateApplyInfo; // ContractOperateApplyInfo 合同操作信息
 
     OperateSrc?: number
-    UserID?: number
+    OperatorID?: number
     ClientTicket?: string
 }
 

src/services/proto/spotcontract/index.ts

@@ -2,6 +2,7 @@ import {getUserId} from "@/services/bus/account";
 import {GldErmcpSpotContractOperateReq, SpotContractOperateReq} from "@/services/proto/spotcontract/interface";
 import {protoMiddleware} from "@/services/socket/protobuf/buildReq";
 import {v4 as uuidv4} from 'uuid';
+import {getLongTypeLoginID} from "@/services/bus/login";
 
 /**（重点提醒 这里属于管理端接口，仅用于新增）以上来自android代码  回头需要确认
  * 新增 / 修改采购合同报文 (很多修改合同操作也在这)
@@ -24,9 +25,9 @@ export const orderContract = (param: GldErmcpSpotContractOperateReq): Promise<an
 export const spotContractStatus = (param: SpotContractOperateReq): Promise<any> => {
     const OperateSrc = 2; // uint32 操作来源-1:管理端2:终端
     const ClientTicket: string = uuidv4();  // 客户端流水号
-    const UserID: number = getUserId(); // 用户id
+    const OperatorID: number = Number(getLongTypeLoginID()); // 用户id
     const reqParams = {
-        ...param, OperateSrc, ClientTicket, UserID
+        ...param, OperateSrc, ClientTicket, OperatorID
     }
     return protoMiddleware<SpotContractOperateReq>(reqParams, 'SpotContractOperateReq', 'SpotContractOperateRsp', 2)
 }