Bläddra i källkod

支持总线接口 OfflineDeliveryReq

zhou.xiaoning 2 år sedan
förälder
incheckning
e5492578db
7 ändrade filer med 347 tillägg och 16 borttagningar
  1. 3 1
      client/client.go
  2. 3 1
      client/msgRealQuote.go
  3. 8 6
      global/funcode.go
  4. 14 0
      initialize/rabbitmq.go
  5. 18 0
      model/mq/request/mq.go
  6. 278 8
      res/pb/mtp2.pb.go
  7. 23 0
      res/pb/mtp2.proto

+ 3 - 1
client/client.go

@@ -85,7 +85,9 @@ func (r *Client) GetQuoteSubs() (quoteSubs []request.QuoteGoods) {
 
 // WriteWsBuf 向客户端发送实时行情
 func (r *Client) WriteQuoteWsBuf(buf []byte) (err error) {
-	r.quoteWriteChan <- buf
+	if r.quoteWriteChan != nil {
+		r.quoteWriteChan <- buf
+	}
 
 	return
 }

+ 3 - 1
client/msgRealQuote.go

@@ -41,7 +41,9 @@ func DispatchRealQuote(p *packet.MiQuotePacket, clinet *Client) {
 		sendBuf := quote.EnPack()
 
 		// 发送给客户端
-		clinet.quoteWriteChan <- sendBuf
+		if clinet.quoteWriteChan != nil {
+			clinet.quoteWriteChan <- sendBuf
+		}
 	}
 }
 

+ 8 - 6
global/funcode.go

@@ -86,12 +86,14 @@ var (
 	WROutApplyReq = 1900657 // 仓单出库申请
 	WROutApplyRsp = 1900658 // 仓单出库申请响应
 
-	OrderReq       = 196609 // 交易委托请求
-	OrderRsp       = 196610 // 交易委托应答
-	CancelOrderReq = 196611 // 撤单请求
-	CancelOrderRsp = 196612 // 撤单应答
-	HolderCloseReq = 196713 // 按单平仓请求
-	HolderCloseRsp = 196714 // 按单平仓应答
+	OrderReq           = 196609 // 交易委托请求
+	OrderRsp           = 196610 // 交易委托应答
+	CancelOrderReq     = 196611 // 撤单请求
+	CancelOrderRsp     = 196612 // 撤单应答
+	HolderCloseReq     = 196713 // 按单平仓请求
+	HolderCloseRsp     = 196714 // 按单平仓应答
+	OfflineDeliveryReq = 196723 // 线下交收申请请求
+	OfflineDeliveryRsp = 196724 // 线下交收申请请求
 
 	DeliveryOrderReq = 393217 // 交割申报请求
 	DeliveryOrderRsp = 393218 // 交割申报应答

+ 14 - 0
initialize/rabbitmq.go

@@ -658,6 +658,19 @@ func (t *MQProc) getRspProtobuf(msg *[]byte) (funcode uint32, sessionId uint32,
 			bytes = &bs
 			serialNumber = p.GetHeader().GetRequestID()
 		}
+	case global.OfflineDeliveryRsp:
+		var p pb.OfflineDeliveryRsp
+		if err = proto.Unmarshal(b, &p); err != nil {
+			global.M2A_LOG.Error("总线回复数据反序列化失败", zap.Error(err))
+			return
+		}
+		if bs, e := protojson.Marshal(&p); e != nil {
+			global.M2A_LOG.Error("总线回复数据反序列化失败", zap.Error(err))
+			return
+		} else {
+			bytes = &bs
+			serialNumber = p.GetHeader().GetRequestID()
+		}
 	}
 
 	return
@@ -825,6 +838,7 @@ func InitFuncodeTopic() {
 		global.HolderCloseReq,
 		global.MakeUpDepositReq,
 		global.HoldAppendDepositReq,
+		global.OfflineDeliveryReq,
 	}
 
 	global.M2A_FuncodeTopic[global.TOPIC_REQ_DELIVERY_TRADE] = []int{

+ 18 - 0
model/mq/request/mq.go

@@ -806,6 +806,24 @@ func (r *MQBodyReq) GetProtoBytes(serialNumber *uint32) (bytes *[]byte, err erro
 		} else {
 			bytes = &b
 		}
+	case global.OfflineDeliveryReq:
+		m := pb.OfflineDeliveryReq{}
+		if err = r.reflect(data, &m); err != nil {
+			return
+		}
+		if m.Header != nil {
+			m.Header.RequestID = serialNumber
+		} else {
+			err = errors.New("请求信息序列化失败")
+			return
+		}
+		if b, e := proto.Marshal(&m); e != nil {
+			global.M2A_LOG.Error(e.Error(), zap.Error(e))
+			err = errors.New("请求信息序列化失败")
+			return
+		} else {
+			bytes = &b
+		}
 	}
 
 	return

+ 278 - 8
res/pb/mtp2.pb.go

@@ -11585,6 +11585,214 @@ func (x *HoldAppendDepositRsp) GetClientSerialNo() string {
 	return ""
 }
 
+// 线下交收申请请求
+type OfflineDeliveryReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Header       *MessageHead `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"`
+	AccountID    *uint64      `protobuf:"varint,2,opt,name=AccountID" json:"AccountID,omitempty"`      // 账号ID
+	UserID       *uint32      `protobuf:"varint,3,opt,name=UserID" json:"UserID,omitempty"`            // 用户ID
+	GoodsCode    *string      `protobuf:"bytes,4,opt,name=GoodsCode" json:"GoodsCode,omitempty"`       // 商品代码
+	GoodsID      *uint32      `protobuf:"varint,5,opt,name=GoodsID" json:"GoodsID,omitempty"`          // 商品ID
+	BuyOrSell    *uint32      `protobuf:"varint,6,opt,name=BuyOrSell" json:"BuyOrSell,omitempty"`      // 方向
+	DeliveryLot  *uint32      `protobuf:"varint,7,opt,name=DeliveryLot" json:"DeliveryLot,omitempty"`  // 交收手数
+	DeliveryInfo *string      `protobuf:"bytes,8,opt,name=DeliveryInfo" json:"DeliveryInfo,omitempty"` // 交收信息
+	ClientTicket *string      `protobuf:"bytes,9,opt,name=ClientTicket" json:"ClientTicket,omitempty"` // 客户端流水号
+}
+
+func (x *OfflineDeliveryReq) Reset() {
+	*x = OfflineDeliveryReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mtp2_proto_msgTypes[100]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OfflineDeliveryReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OfflineDeliveryReq) ProtoMessage() {}
+
+func (x *OfflineDeliveryReq) ProtoReflect() protoreflect.Message {
+	mi := &file_mtp2_proto_msgTypes[100]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OfflineDeliveryReq.ProtoReflect.Descriptor instead.
+func (*OfflineDeliveryReq) Descriptor() ([]byte, []int) {
+	return file_mtp2_proto_rawDescGZIP(), []int{100}
+}
+
+func (x *OfflineDeliveryReq) GetHeader() *MessageHead {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *OfflineDeliveryReq) GetAccountID() uint64 {
+	if x != nil && x.AccountID != nil {
+		return *x.AccountID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryReq) GetUserID() uint32 {
+	if x != nil && x.UserID != nil {
+		return *x.UserID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryReq) GetGoodsCode() string {
+	if x != nil && x.GoodsCode != nil {
+		return *x.GoodsCode
+	}
+	return ""
+}
+
+func (x *OfflineDeliveryReq) GetGoodsID() uint32 {
+	if x != nil && x.GoodsID != nil {
+		return *x.GoodsID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryReq) GetBuyOrSell() uint32 {
+	if x != nil && x.BuyOrSell != nil {
+		return *x.BuyOrSell
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryReq) GetDeliveryLot() uint32 {
+	if x != nil && x.DeliveryLot != nil {
+		return *x.DeliveryLot
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryReq) GetDeliveryInfo() string {
+	if x != nil && x.DeliveryInfo != nil {
+		return *x.DeliveryInfo
+	}
+	return ""
+}
+
+func (x *OfflineDeliveryReq) GetClientTicket() string {
+	if x != nil && x.ClientTicket != nil {
+		return *x.ClientTicket
+	}
+	return ""
+}
+
+// 线下交收申请请求
+type OfflineDeliveryRsp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Header       *MessageHead `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"`             // 消息头
+	RetCode      *int32       `protobuf:"varint,2,opt,name=RetCode" json:"RetCode,omitempty"`          // 返回码
+	RetDesc      *string      `protobuf:"bytes,3,opt,name=RetDesc" json:"RetDesc,omitempty"`           // 描述信息
+	AccountID    *uint64      `protobuf:"varint,4,opt,name=AccountID" json:"AccountID,omitempty"`      // 账号ID
+	UserID       *uint32      `protobuf:"varint,5,opt,name=UserID" json:"UserID,omitempty"`            // 用户ID
+	ApplyID      *uint64      `protobuf:"varint,6,opt,name=ApplyID" json:"ApplyID,omitempty"`          // 申请ID
+	ClientTicket *string      `protobuf:"bytes,7,opt,name=ClientTicket" json:"ClientTicket,omitempty"` // 客户端流水号
+}
+
+func (x *OfflineDeliveryRsp) Reset() {
+	*x = OfflineDeliveryRsp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mtp2_proto_msgTypes[101]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OfflineDeliveryRsp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OfflineDeliveryRsp) ProtoMessage() {}
+
+func (x *OfflineDeliveryRsp) ProtoReflect() protoreflect.Message {
+	mi := &file_mtp2_proto_msgTypes[101]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use OfflineDeliveryRsp.ProtoReflect.Descriptor instead.
+func (*OfflineDeliveryRsp) Descriptor() ([]byte, []int) {
+	return file_mtp2_proto_rawDescGZIP(), []int{101}
+}
+
+func (x *OfflineDeliveryRsp) GetHeader() *MessageHead {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *OfflineDeliveryRsp) GetRetCode() int32 {
+	if x != nil && x.RetCode != nil {
+		return *x.RetCode
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryRsp) GetRetDesc() string {
+	if x != nil && x.RetDesc != nil {
+		return *x.RetDesc
+	}
+	return ""
+}
+
+func (x *OfflineDeliveryRsp) GetAccountID() uint64 {
+	if x != nil && x.AccountID != nil {
+		return *x.AccountID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryRsp) GetUserID() uint32 {
+	if x != nil && x.UserID != nil {
+		return *x.UserID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryRsp) GetApplyID() uint64 {
+	if x != nil && x.ApplyID != nil {
+		return *x.ApplyID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryRsp) GetClientTicket() string {
+	if x != nil && x.ClientTicket != nil {
+		return *x.ClientTicket
+	}
+	return ""
+}
+
 var File_mtp2_proto protoreflect.FileDescriptor
 
 var file_mtp2_proto_rawDesc = []byte{
@@ -13732,7 +13940,41 @@ var file_mtp2_proto_rawDesc = []byte{
 	0x28, 0x04, 0x52, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x26, 0x0a,
 	0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x6f, 0x18,
 	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72,
-	0x69, 0x61, 0x6c, 0x4e, 0x6f,
+	0x69, 0x61, 0x6c, 0x4e, 0x6f, 0x22, 0xb3, 0x02, 0x0a, 0x12, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e,
+	0x65, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x06,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70,
+	0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x65, 0x61, 0x64, 0x52, 0x06, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x47,
+	0x6f, 0x6f, 0x64, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x47, 0x6f, 0x6f, 0x64, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f,
+	0x64, 0x73, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64,
+	0x73, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x75, 0x79, 0x4f, 0x72, 0x53, 0x65, 0x6c, 0x6c,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x42, 0x75, 0x79, 0x4f, 0x72, 0x53, 0x65, 0x6c,
+	0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x74,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79,
+	0x4c, 0x6f, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x49,
+	0x6e, 0x66, 0x6f, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x44, 0x65, 0x6c, 0x69, 0x76,
+	0x65, 0x72, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x43,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0xe5, 0x01, 0x0a, 0x12,
+	0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52,
+	0x73, 0x70, 0x12, 0x27, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48,
+	0x65, 0x61, 0x64, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x52,
+	0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x52, 0x65,
+	0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x65, 0x74, 0x44, 0x65, 0x73, 0x63,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x52, 0x65, 0x74, 0x44, 0x65, 0x73, 0x63, 0x12,
+	0x1c, 0x0a, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x04, 0x52, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x16, 0x0a,
+	0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x55,
+	0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x49, 0x44,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x49, 0x44, 0x12,
+	0x22, 0x0a, 0x0c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x69, 0x63,
+	0x6b, 0x65, 0x74,
 }
 
 var (
@@ -13747,7 +13989,7 @@ func file_mtp2_proto_rawDescGZIP() []byte {
 	return file_mtp2_proto_rawDescData
 }
 
-var file_mtp2_proto_msgTypes = make([]protoimpl.MessageInfo, 100)
+var file_mtp2_proto_msgTypes = make([]protoimpl.MessageInfo, 102)
 var file_mtp2_proto_goTypes = []interface{}{
 	(*MessageHead)(nil),                         // 0: pb.MessageHead
 	(*NotifyHead)(nil),                          // 1: pb.NotifyHead
@@ -13849,6 +14091,8 @@ var file_mtp2_proto_goTypes = []interface{}{
 	(*MakeUpDepositRsp)(nil),                    // 97: pb.MakeUpDepositRsp
 	(*HoldAppendDepositReq)(nil),                // 98: pb.HoldAppendDepositReq
 	(*HoldAppendDepositRsp)(nil),                // 99: pb.HoldAppendDepositRsp
+	(*OfflineDeliveryReq)(nil),                  // 100: pb.OfflineDeliveryReq
+	(*OfflineDeliveryRsp)(nil),                  // 101: pb.OfflineDeliveryRsp
 }
 var file_mtp2_proto_depIdxs = []int32{
 	0,   // 0: pb.MoneyChangedNtf.Header:type_name -> pb.MessageHead
@@ -13953,11 +14197,13 @@ var file_mtp2_proto_depIdxs = []int32{
 	0,   // 99: pb.MakeUpDepositRsp.Header:type_name -> pb.MessageHead
 	0,   // 100: pb.HoldAppendDepositReq.Header:type_name -> pb.MessageHead
 	0,   // 101: pb.HoldAppendDepositRsp.Header:type_name -> pb.MessageHead
-	102, // [102:102] is the sub-list for method output_type
-	102, // [102:102] is the sub-list for method input_type
-	102, // [102:102] is the sub-list for extension type_name
-	102, // [102:102] is the sub-list for extension extendee
-	0,   // [0:102] is the sub-list for field type_name
+	0,   // 102: pb.OfflineDeliveryReq.Header:type_name -> pb.MessageHead
+	0,   // 103: pb.OfflineDeliveryRsp.Header:type_name -> pb.MessageHead
+	104, // [104:104] is the sub-list for method output_type
+	104, // [104:104] is the sub-list for method input_type
+	104, // [104:104] is the sub-list for extension type_name
+	104, // [104:104] is the sub-list for extension extendee
+	0,   // [0:104] is the sub-list for field type_name
 }
 
 func init() { file_mtp2_proto_init() }
@@ -15166,6 +15412,30 @@ func file_mtp2_proto_init() {
 				return nil
 			}
 		}
+		file_mtp2_proto_msgTypes[100].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OfflineDeliveryReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_mtp2_proto_msgTypes[101].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OfflineDeliveryRsp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -15173,7 +15443,7 @@ func file_mtp2_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_mtp2_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   100,
+			NumMessages:   102,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

+ 23 - 0
res/pb/mtp2.proto

@@ -1330,4 +1330,27 @@ message HoldAppendDepositRsp {
 		optional uint64 GoodsID = 4; // 商品ID,必填
 		optional uint64 AccountID = 5; // 交易账号,必填
 		optional string ClientSerialNo = 6; // 客户端流水号
+}
+
+// 线下交收申请请求
+message OfflineDeliveryReq {
+	optional MessageHead Header = 1;
+			optional uint64 AccountID = 2; // 账号ID
+			optional uint32 UserID = 3; // 用户ID
+			optional string GoodsCode = 4; // 商品代码
+		optional uint32 GoodsID = 5; // 商品ID
+			optional uint32 BuyOrSell = 6; // 方向
+			optional uint32 DeliveryLot = 7; // 交收手数
+			optional string DeliveryInfo = 8; // 交收信息
+			optional string ClientTicket = 9; // 客户端流水号
+}
+// 线下交收申请请求
+message OfflineDeliveryRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+			optional uint64 AccountID = 4; // 账号ID
+			optional uint32 UserID = 5; // 用户ID
+			optional uint64 ApplyID = 6; // 申请ID
+			optional string ClientTicket = 7; // 客户端流水号
 }