增加接口支持：OfflineDeliveryApplyCancelOrderReq 线下交收申请撤销接口请求

client/client.go

@@ -122,7 +122,7 @@ func (r *Client) GetAllAsyncTask() *map[string]*AsyncTask {
 // **************** Trade WebSocket ****************
 
 func (r *Client) SetTradeWebSocket(ws *websocket.Conn) (err error) {
-	global.M2A_LOG.Info("交易长连 SetTradeWebSocket 33333333333333333333")
+	// global.M2A_LOG.Info("交易长连 SetTradeWebSocket 33333333333333333333")
 
 	r.mtx.Lock()
 	defer r.mtx.Unlock()

global/funcode.go

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

initialize/rabbitmq.go

@@ -786,6 +786,19 @@ func (t *MQProc) getRspProtobuf(msg *[]byte) (funcode uint32, sessionId uint32,
 			bytes = &bs
 			serialNumber = p.GetHeader().GetRequestID()
 		}
+	case global.OfflineDeliveryApplyCancelOrderRsp:
+		var p pb.OfflineDeliveryApplyCancelOrderRsp
+		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()
+		}
 	case global.CancelOrderRsp:
 		var p pb.CancelOrderRsp
 		if err = proto.Unmarshal(b, &p); err != nil {
@@ -1118,6 +1131,7 @@ func InitFuncodeTopic() {
 		global.RefundedDepositReq,
 		global.MarketOrderDeliveryApplyReq,
 		global.DeliveryClientOperatorReq,
+		global.OfflineDeliveryApplyCancelOrderReq,
 	}
 
 	global.M2A_FuncodeTopic[global.TOPIC_REQ_DELIVERY_TRADE] = []int{

model/mq/request/mq.go

@@ -716,6 +716,24 @@ func (r *MQBodyReq) GetProtoBytes(serialNumber *uint32) (bytes *[]byte, err erro
 		} else {
 			bytes = &b
 		}
+	case global.OfflineDeliveryApplyCancelOrderReq:
+		m := pb.OfflineDeliveryApplyCancelOrderReq{}
+		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
+		}
 	case global.CancelOrderReq:
 		m := pb.CancelOrderReq{}
 		if err = r.reflect(data, &m); err != nil {

res/pb/mtp2.pb.go

@@ -14361,6 +14361,190 @@ func (x *OrderCanceledNtf) GetOrderStatus() uint32 {
 	return 0
 }
 
+// 线下交收申请撤销接口请求
+type OfflineDeliveryApplyCancelOrderReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Header          *MessageHead `protobuf:"bytes,1,opt,name=Header" json:"Header,omitempty"`
+	UserID          *uint32      `protobuf:"varint,2,opt,name=UserID" json:"UserID,omitempty"`                   // 用户ID，必填
+	AccountID       *uint64      `protobuf:"varint,3,opt,name=AccountID" json:"AccountID,omitempty"`             // 交易账号，必填
+	DeliveryOrderID *uint64      `protobuf:"varint,4,opt,name=DeliveryOrderID" json:"DeliveryOrderID,omitempty"` // 交收单号，必填
+	ClientSerialNo  *string      `protobuf:"bytes,5,opt,name=ClientSerialNo" json:"ClientSerialNo,omitempty"`    // 客户端流水号
+	ClientType      *uint32      `protobuf:"varint,6,opt,name=ClientType" json:"ClientType,omitempty"`           // 终端类型
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) Reset() {
+	*x = OfflineDeliveryApplyCancelOrderReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mtp2_proto_msgTypes[125]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OfflineDeliveryApplyCancelOrderReq) ProtoMessage() {}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) ProtoReflect() protoreflect.Message {
+	mi := &file_mtp2_proto_msgTypes[125]
+	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 OfflineDeliveryApplyCancelOrderReq.ProtoReflect.Descriptor instead.
+func (*OfflineDeliveryApplyCancelOrderReq) Descriptor() ([]byte, []int) {
+	return file_mtp2_proto_rawDescGZIP(), []int{125}
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) GetHeader() *MessageHead {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) GetUserID() uint32 {
+	if x != nil && x.UserID != nil {
+		return *x.UserID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) GetAccountID() uint64 {
+	if x != nil && x.AccountID != nil {
+		return *x.AccountID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) GetDeliveryOrderID() uint64 {
+	if x != nil && x.DeliveryOrderID != nil {
+		return *x.DeliveryOrderID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) GetClientSerialNo() string {
+	if x != nil && x.ClientSerialNo != nil {
+		return *x.ClientSerialNo
+	}
+	return ""
+}
+
+func (x *OfflineDeliveryApplyCancelOrderReq) GetClientType() uint32 {
+	if x != nil && x.ClientType != nil {
+		return *x.ClientType
+	}
+	return 0
+}
+
+// 线下交收申请撤销接口响应
+type OfflineDeliveryApplyCancelOrderRsp 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"`                  // 描述信息
+	DeliveryOrderID *uint64      `protobuf:"varint,4,opt,name=DeliveryOrderID" json:"DeliveryOrderID,omitempty"` // 交收单号，必填
+	UserID          *uint32      `protobuf:"varint,5,opt,name=UserID" json:"UserID,omitempty"`                   // 用户ID，必填
+	AccountID       *uint64      `protobuf:"varint,6,opt,name=AccountID" json:"AccountID,omitempty"`             // 交易账号，必填
+	ClientSerialNo  *string      `protobuf:"bytes,7,opt,name=ClientSerialNo" json:"ClientSerialNo,omitempty"`    // 客户端流水号
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) Reset() {
+	*x = OfflineDeliveryApplyCancelOrderRsp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_mtp2_proto_msgTypes[126]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*OfflineDeliveryApplyCancelOrderRsp) ProtoMessage() {}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) ProtoReflect() protoreflect.Message {
+	mi := &file_mtp2_proto_msgTypes[126]
+	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 OfflineDeliveryApplyCancelOrderRsp.ProtoReflect.Descriptor instead.
+func (*OfflineDeliveryApplyCancelOrderRsp) Descriptor() ([]byte, []int) {
+	return file_mtp2_proto_rawDescGZIP(), []int{126}
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetHeader() *MessageHead {
+	if x != nil {
+		return x.Header
+	}
+	return nil
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetRetCode() int32 {
+	if x != nil && x.RetCode != nil {
+		return *x.RetCode
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetRetDesc() string {
+	if x != nil && x.RetDesc != nil {
+		return *x.RetDesc
+	}
+	return ""
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetDeliveryOrderID() uint64 {
+	if x != nil && x.DeliveryOrderID != nil {
+		return *x.DeliveryOrderID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetUserID() uint32 {
+	if x != nil && x.UserID != nil {
+		return *x.UserID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetAccountID() uint64 {
+	if x != nil && x.AccountID != nil {
+		return *x.AccountID
+	}
+	return 0
+}
+
+func (x *OfflineDeliveryApplyCancelOrderRsp) GetClientSerialNo() string {
+	if x != nil && x.ClientSerialNo != nil {
+		return *x.ClientSerialNo
+	}
+	return ""
+}
+
 var File_mtp2_proto protoreflect.FileDescriptor
 
 var file_mtp2_proto_rawDesc = []byte{
@@ -16998,7 +17182,40 @@ var file_mtp2_proto_rawDesc = []byte{
 	0x09, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x51, 0x74, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04,
 	0x52, 0x09, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x51, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x4f,
 	0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+	0x52, 0x0b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xf5, 0x01,
+	0x0a, 0x22, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72,
+	0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 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, 0x16, 0x0a,
+	0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x55,
+	0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x49, 0x44, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x44, 0x65,
+	0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x44, 0x12, 0x26, 0x0a,
+	0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x6f, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72,
+	0x69, 0x61, 0x6c, 0x4e, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x22, 0x89, 0x02, 0x0a, 0x22, 0x4f, 0x66, 0x66, 0x6c, 0x69, 0x6e,
+	0x65, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x43, 0x61,
+	0x6e, 0x63, 0x65, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 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, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x6c,
+	0x69, 0x76, 0x65, 0x72, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x04, 0x52, 0x0f, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 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, 0x1c, 0x0a, 0x09, 0x41,
+	0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x06, 0x20, 0x01, 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, 0x07, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e,
+	0x6f,
 }
 
 var (
@@ -17013,7 +17230,7 @@ func file_mtp2_proto_rawDescGZIP() []byte {
 	return file_mtp2_proto_rawDescData
 }
 
-var file_mtp2_proto_msgTypes = make([]protoimpl.MessageInfo, 125)
+var file_mtp2_proto_msgTypes = make([]protoimpl.MessageInfo, 127)
 var file_mtp2_proto_goTypes = []interface{}{
 	(*MessageHead)(nil),                         // 0: pb.MessageHead
 	(*NotifyHead)(nil),                          // 1: pb.NotifyHead
@@ -17140,6 +17357,8 @@ var file_mtp2_proto_goTypes = []interface{}{
 	(*LogoutRsp)(nil),                           // 122: pb.LogoutRsp
 	(*PosChangedNtf)(nil),                       // 123: pb.PosChangedNtf
 	(*OrderCanceledNtf)(nil),                    // 124: pb.OrderCanceledNtf
+	(*OfflineDeliveryApplyCancelOrderReq)(nil),  // 125: pb.OfflineDeliveryApplyCancelOrderReq
+	(*OfflineDeliveryApplyCancelOrderRsp)(nil),  // 126: pb.OfflineDeliveryApplyCancelOrderRsp
 }
 var file_mtp2_proto_depIdxs = []int32{
 	0,   // 0: pb.MoneyChangedNtf.Header:type_name -> pb.MessageHead
@@ -17274,11 +17493,13 @@ var file_mtp2_proto_depIdxs = []int32{
 	1,   // 129: pb.PosChangedNtf.NtfHeader:type_name -> pb.NotifyHead
 	0,   // 130: pb.OrderCanceledNtf.Header:type_name -> pb.MessageHead
 	1,   // 131: pb.OrderCanceledNtf.NtfHeader:type_name -> pb.NotifyHead
-	132, // [132:132] is the sub-list for method output_type
-	132, // [132:132] is the sub-list for method input_type
-	132, // [132:132] is the sub-list for extension type_name
-	132, // [132:132] is the sub-list for extension extendee
-	0,   // [0:132] is the sub-list for field type_name
+	0,   // 132: pb.OfflineDeliveryApplyCancelOrderReq.Header:type_name -> pb.MessageHead
+	0,   // 133: pb.OfflineDeliveryApplyCancelOrderRsp.Header:type_name -> pb.MessageHead
+	134, // [134:134] is the sub-list for method output_type
+	134, // [134:134] is the sub-list for method input_type
+	134, // [134:134] is the sub-list for extension type_name
+	134, // [134:134] is the sub-list for extension extendee
+	0,   // [0:134] is the sub-list for field type_name
 }
 
 func init() { file_mtp2_proto_init() }
@@ -18787,6 +19008,30 @@ func file_mtp2_proto_init() {
 				return nil
 			}
 		}
+		file_mtp2_proto_msgTypes[125].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OfflineDeliveryApplyCancelOrderReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_mtp2_proto_msgTypes[126].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*OfflineDeliveryApplyCancelOrderRsp); 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{
@@ -18794,7 +19039,7 @@ func file_mtp2_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_mtp2_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   125,
+			NumMessages:   127,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

res/pb/mtp2.proto

@@ -1633,4 +1633,23 @@ message OrderCanceledNtf {
 		optional uint32 GoodsID = 5; // uint32 商品
 		optional uint64 CancelQty = 6; // uint64 撤销数量
 		optional uint32 OrderStatus = 7; // uint32 单据状态
+}
+// 线下交收申请撤销接口请求
+message OfflineDeliveryApplyCancelOrderReq {
+	optional MessageHead Header = 1;
+		optional uint32 UserID = 2; // 用户ID，必填
+		optional uint64 AccountID = 3; // 交易账号，必填
+		optional uint64 DeliveryOrderID = 4; // 交收单号，必填
+		optional string ClientSerialNo = 5; // 客户端流水号
+		optional uint32 ClientType = 6; // 终端类型
+}
+// 线下交收申请撤销接口响应
+message OfflineDeliveryApplyCancelOrderRsp {
+	optional MessageHead Header = 1; // 消息头
+	optional int32 RetCode = 2; // 返回码
+	optional string RetDesc = 3; // 描述信息
+		optional uint64 DeliveryOrderID = 4; // 交收单号，必填
+		optional uint32 UserID = 5; // 用户ID，必填
+		optional uint64 AccountID = 6; // 交易账号，必填
+		optional string ClientSerialNo = 7; // 客户端流水号
 }