Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/services/proto/warehousetrade/index.ts

@@ -50,7 +50,7 @@ export const wRListingCancelOrder = (param: WRListingCancelOrderReq): Promise<an
  * @param param
  */
 export const WarehouseRepurchase = (param: WarehouseRepurchaseReq): Promise<any> => {
-    return protoMiddleware<WarehouseRepurchaseReq>(param, 'WarehouseRepurchaseReq', 'WarehouseRepurchaseRsp', HeadEnum.tradeMode45)
+    return protoMiddleware<WarehouseRepurchaseReq>(param, 'WarehouseRepurchaseReq', 'WarehouseRepurchaseRsp', HeadEnum.MarketID45201)
 }
 
 
@@ -59,7 +59,7 @@ export const WarehouseRepurchase = (param: WarehouseRepurchaseReq): Promise<any>
  * @param param
  */
 export const PaymentArrears = (param: PaymentArrearsReq): Promise<any> => {
-    return protoMiddleware<PaymentArrearsReq>(param, 'PaymentArrearsReq', 'PaymentArrearsRsp', HeadEnum.tradeMode45)
+    return protoMiddleware<PaymentArrearsReq>(param, 'PaymentArrearsReq', 'PaymentArrearsRsp', HeadEnum.MarketID45201)
 }
 
 

src/services/socket/protobuf/protoHeader.ts

@@ -1,9 +1,9 @@
-import { TradeMode } from "@/common/constants/enumCommon";
-import { getSelectedAccountId, getUserId } from "@/services/bus/account";
-import { getMarketByTradeMode } from "@/services/bus/market";
-import { funCode } from "@/services/funcode";
-import { v4 as uuidv4 } from 'uuid';
-import { IMessageHead } from "./proto";
+import {TradeMode} from "@/common/constants/enumCommon";
+import {getSelectedAccountId, getUserId} from "@/services/bus/account";
+import {getMarketByTradeMode} from "@/services/bus/market";
+import {funCode} from "@/services/funcode";
+import {v4 as uuidv4} from 'uuid';
+import {IMessageHead} from "./proto";
 
 export enum HeadEnum {
     common, // funcode uuid userID
@@ -11,6 +11,7 @@ export enum HeadEnum {
     MarketID18_GoodsID0, // funcode uuid userID, MarketID:18, GoodsID: 0
     MarketID15101,
     MarketID69201,
+    MarketID45201,
     tradeMode17,
     tradeMode45
 }
@@ -34,7 +35,7 @@ export function getProtoHeadParam(funCodeName: string, type: HeadEnum = 0): IMes
         case HeadEnum.common:
             break
         case HeadEnum.AccountID:
-            result = Object.assign(result, { AccountID: getSelectedAccountId() })
+            result = Object.assign(result, {AccountID: getSelectedAccountId()})
             break
         case HeadEnum.MarketID18_GoodsID0:
             result = Object.assign(result, {
@@ -43,16 +44,19 @@ export function getProtoHeadParam(funCodeName: string, type: HeadEnum = 0): IMes
             })
             break
         case HeadEnum.MarketID15101:
-            result = Object.assign(result, { MarketID: 15101 })
+            result = Object.assign(result, {MarketID: 15101})
             break;
         case HeadEnum.MarketID69201:
-            result = Object.assign(result, { MarketID: getMarketByTradeMode(TradeMode.Platinum)?.marketid, })
+            result = Object.assign(result, {MarketID: getMarketByTradeMode(TradeMode.Platinum)?.marketid,})
             break;
         case HeadEnum.tradeMode17:
-            result = Object.assign(result, { MarketID: getMarketByTradeMode(TradeMode.WarehouseReceiptTrade)?.marketid, })
+            result = Object.assign(result, {MarketID: getMarketByTradeMode(TradeMode.WarehouseReceiptTrade)?.marketid,})
             break;
         case HeadEnum.tradeMode45:
-            result = Object.assign(result, { MarketID: getMarketByTradeMode(TradeMode.Wrtrade)?.marketid, })
+            result = Object.assign(result, {MarketID: getMarketByTradeMode(TradeMode.Wrtrade)?.marketid,})
+            break;
+        case HeadEnum.MarketID45201:
+            result = Object.assign(result, {MarketID: 45201})
             break;
     }
     return result