This commit is contained in:
2026-09-21 15:03:52 +08:00
parent d597975b42
commit 369bbd43fd
31 changed files with 2480 additions and 769 deletions
Binary file not shown.
+10
View File
@@ -100,6 +100,14 @@ message IdApiRequest {
int32 type=2;
}
message DeliveryInfoResponse {
string transit_name = 1;
string transit_sn = 2;
string estimated_time = 3;
string transit_query = 4;
int32 status = 5;
int64 id = 6;
}
service Express {
@@ -216,4 +224,6 @@ service Express {
//添加生成订单的发货信息
rpc DeliveryOrderCreate(DeliveryOrderCreateRequest) returns(IdResponse);
rpc GetDeliveryByOrderId(IdRequest) returns(DeliveryInfoResponse);
rpc GetDeliveryBySupplyId(IdRequest) returns(DeliveryInfoResponse);
}
+123 -24
View File
@@ -958,6 +958,90 @@ func (x *IdApiRequest) GetType() int32 {
return 0
}
type DeliveryInfoResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
TransitName string `protobuf:"bytes,1,opt,name=transit_name,json=transitName,proto3" json:"transit_name,omitempty"`
TransitSn string `protobuf:"bytes,2,opt,name=transit_sn,json=transitSn,proto3" json:"transit_sn,omitempty"`
EstimatedTime string `protobuf:"bytes,3,opt,name=estimated_time,json=estimatedTime,proto3" json:"estimated_time,omitempty"`
TransitQuery string `protobuf:"bytes,4,opt,name=transit_query,json=transitQuery,proto3" json:"transit_query,omitempty"`
Status int32 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"`
Id int64 `protobuf:"varint,6,opt,name=id,proto3" json:"id,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *DeliveryInfoResponse) Reset() {
*x = DeliveryInfoResponse{}
mi := &file_express_express_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *DeliveryInfoResponse) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DeliveryInfoResponse) ProtoMessage() {}
func (x *DeliveryInfoResponse) ProtoReflect() protoreflect.Message {
mi := &file_express_express_proto_msgTypes[14]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DeliveryInfoResponse.ProtoReflect.Descriptor instead.
func (*DeliveryInfoResponse) Descriptor() ([]byte, []int) {
return file_express_express_proto_rawDescGZIP(), []int{14}
}
func (x *DeliveryInfoResponse) GetTransitName() string {
if x != nil {
return x.TransitName
}
return ""
}
func (x *DeliveryInfoResponse) GetTransitSn() string {
if x != nil {
return x.TransitSn
}
return ""
}
func (x *DeliveryInfoResponse) GetEstimatedTime() string {
if x != nil {
return x.EstimatedTime
}
return ""
}
func (x *DeliveryInfoResponse) GetTransitQuery() string {
if x != nil {
return x.TransitQuery
}
return ""
}
func (x *DeliveryInfoResponse) GetStatus() int32 {
if x != nil {
return x.Status
}
return 0
}
func (x *DeliveryInfoResponse) GetId() int64 {
if x != nil {
return x.Id
}
return 0
}
var File_express_express_proto protoreflect.FileDescriptor
const file_express_express_proto_rawDesc = "" +
@@ -1040,7 +1124,15 @@ const file_express_express_proto_rawDesc = "" +
"\x04code\x18\x01 \x01(\tR\x04code\"2\n" +
"\fIdApiRequest\x12\x0e\n" +
"\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" +
"\x04type\x18\x02 \x01(\x05R\x04type2\xa0\r\n" +
"\x04type\x18\x02 \x01(\x05R\x04type\"\xcc\x01\n" +
"\x14DeliveryInfoResponse\x12!\n" +
"\ftransit_name\x18\x01 \x01(\tR\vtransitName\x12\x1d\n" +
"\n" +
"transit_sn\x18\x02 \x01(\tR\ttransitSn\x12%\n" +
"\x0eestimated_time\x18\x03 \x01(\tR\restimatedTime\x12#\n" +
"\rtransit_query\x18\x04 \x01(\tR\ftransitQuery\x12\x16\n" +
"\x06status\x18\x05 \x01(\x05R\x06status\x12\x0e\n" +
"\x02id\x18\x06 \x01(\x03R\x02id2\xb7\x0e\n" +
"\aExpress\x12U\n" +
"\x05Items\x12\x15.express.EmtpyRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/express/items\x12X\n" +
"\x06Create\x12\x16.express.CreateRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/express/create\x12T\n" +
@@ -1059,7 +1151,9 @@ const file_express_express_proto_rawDesc = "" +
"\x15ExpressAdminEstimated\x12\x12.express.IdRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/admin/v3/express/estimated\x12_\n" +
"\x10ExpressApiCancel\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/api/v3/express/cancel\x12`\n" +
"\x12ExpressAdminCancel\x12\x12.express.IdRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x12\x18/admin/v3/express/cancel\x12O\n" +
"\x13DeliveryOrderCreate\x12#.express.DeliveryOrderCreateRequest\x1a\x13.express.IdResponseB\vZ\t./expressb\x06proto3"
"\x13DeliveryOrderCreate\x12#.express.DeliveryOrderCreateRequest\x1a\x13.express.IdResponse\x12I\n" +
"\x14GetDeliveryByOrderId\x12\x12.express.IdRequest\x1a\x1d.express.DeliveryInfoResponse\x12J\n" +
"\x15GetDeliveryBySupplyId\x12\x12.express.IdRequest\x1a\x1d.express.DeliveryInfoResponseB\vZ\t./expressb\x06proto3"
var (
file_express_express_proto_rawDescOnce sync.Once
@@ -1073,7 +1167,7 @@ func file_express_express_proto_rawDescGZIP() []byte {
return file_express_express_proto_rawDescData
}
var file_express_express_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_express_express_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
var file_express_express_proto_goTypes = []any{
(*Response)(nil), // 0: express.Response
(*SfResponse)(nil), // 1: express.SfResponse
@@ -1089,6 +1183,7 @@ var file_express_express_proto_goTypes = []any{
(*DeliveringRequest)(nil), // 11: express.DeliveringRequest
(*ExpressCompanyRequest)(nil), // 12: express.ExpressCompanyRequest
(*IdApiRequest)(nil), // 13: express.IdApiRequest
(*DeliveryInfoResponse)(nil), // 14: express.DeliveryInfoResponse
}
var file_express_express_proto_depIdxs = []int32{
10, // 0: express.DeliveryOrderCreateRequest.product_info:type_name -> express.DeliverOrderProductInfo
@@ -1110,26 +1205,30 @@ var file_express_express_proto_depIdxs = []int32{
13, // 16: express.Express.ExpressApiCancel:input_type -> express.IdApiRequest
6, // 17: express.Express.ExpressAdminCancel:input_type -> express.IdRequest
9, // 18: express.Express.DeliveryOrderCreate:input_type -> express.DeliveryOrderCreateRequest
0, // 19: express.Express.Items:output_type -> express.Response
0, // 20: express.Express.Create:output_type -> express.Response
0, // 21: express.Express.Edit:output_type -> express.Response
0, // 22: express.Express.Info:output_type -> express.Response
0, // 23: express.Express.Names:output_type -> express.Response
0, // 24: express.Express.Status:output_type -> express.Response
0, // 25: express.Express.History:output_type -> express.Response
0, // 26: express.Express.ExpressCompany:output_type -> express.Response
0, // 27: express.Express.ExpressDelivering:output_type -> express.Response
1, // 28: express.Express.ExpressSfBack:output_type -> express.SfResponse
1, // 29: express.Express.ExpressJdBack:output_type -> express.SfResponse
0, // 30: express.Express.ExpressApiQuery:output_type -> express.Response
0, // 31: express.Express.ExpressAdminQuery:output_type -> express.Response
0, // 32: express.Express.ExpressApiEstimated:output_type -> express.Response
0, // 33: express.Express.ExpressAdminEstimated:output_type -> express.Response
0, // 34: express.Express.ExpressApiCancel:output_type -> express.Response
0, // 35: express.Express.ExpressAdminCancel:output_type -> express.Response
2, // 36: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse
19, // [19:37] is the sub-list for method output_type
1, // [1:19] is the sub-list for method input_type
6, // 19: express.Express.GetDeliveryByOrderId:input_type -> express.IdRequest
6, // 20: express.Express.GetDeliveryBySupplyId:input_type -> express.IdRequest
0, // 21: express.Express.Items:output_type -> express.Response
0, // 22: express.Express.Create:output_type -> express.Response
0, // 23: express.Express.Edit:output_type -> express.Response
0, // 24: express.Express.Info:output_type -> express.Response
0, // 25: express.Express.Names:output_type -> express.Response
0, // 26: express.Express.Status:output_type -> express.Response
0, // 27: express.Express.History:output_type -> express.Response
0, // 28: express.Express.ExpressCompany:output_type -> express.Response
0, // 29: express.Express.ExpressDelivering:output_type -> express.Response
1, // 30: express.Express.ExpressSfBack:output_type -> express.SfResponse
1, // 31: express.Express.ExpressJdBack:output_type -> express.SfResponse
0, // 32: express.Express.ExpressApiQuery:output_type -> express.Response
0, // 33: express.Express.ExpressAdminQuery:output_type -> express.Response
0, // 34: express.Express.ExpressApiEstimated:output_type -> express.Response
0, // 35: express.Express.ExpressAdminEstimated:output_type -> express.Response
0, // 36: express.Express.ExpressApiCancel:output_type -> express.Response
0, // 37: express.Express.ExpressAdminCancel:output_type -> express.Response
2, // 38: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse
14, // 39: express.Express.GetDeliveryByOrderId:output_type -> express.DeliveryInfoResponse
14, // 40: express.Express.GetDeliveryBySupplyId:output_type -> express.DeliveryInfoResponse
21, // [21:41] is the sub-list for method output_type
1, // [1:21] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name
1, // [1:1] is the sub-list for extension extendee
0, // [0:1] is the sub-list for field type_name
@@ -1146,7 +1245,7 @@ func file_express_express_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_express_express_proto_rawDesc), len(file_express_express_proto_rawDesc)),
NumEnums: 0,
NumMessages: 14,
NumMessages: 15,
NumExtensions: 0,
NumServices: 1,
},
+76
View File
@@ -37,6 +37,8 @@ const (
Express_ExpressApiCancel_FullMethodName = "/express.Express/ExpressApiCancel"
Express_ExpressAdminCancel_FullMethodName = "/express.Express/ExpressAdminCancel"
Express_DeliveryOrderCreate_FullMethodName = "/express.Express/DeliveryOrderCreate"
Express_GetDeliveryByOrderId_FullMethodName = "/express.Express/GetDeliveryByOrderId"
Express_GetDeliveryBySupplyId_FullMethodName = "/express.Express/GetDeliveryBySupplyId"
)
// ExpressClient is the client API for Express service.
@@ -64,6 +66,8 @@ type ExpressClient interface {
ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error)
// 添加生成订单的发货信息
DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error)
GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error)
GetDeliveryBySupplyId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error)
}
type expressClient struct {
@@ -254,6 +258,26 @@ func (c *expressClient) DeliveryOrderCreate(ctx context.Context, in *DeliveryOrd
return out, nil
}
func (c *expressClient) GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(DeliveryInfoResponse)
err := c.cc.Invoke(ctx, Express_GetDeliveryByOrderId_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *expressClient) GetDeliveryBySupplyId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(DeliveryInfoResponse)
err := c.cc.Invoke(ctx, Express_GetDeliveryBySupplyId_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
// ExpressServer is the server API for Express service.
// All implementations must embed UnimplementedExpressServer
// for forward compatibility.
@@ -279,6 +303,8 @@ type ExpressServer interface {
ExpressAdminCancel(context.Context, *IdRequest) (*Response, error)
// 添加生成订单的发货信息
DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error)
GetDeliveryByOrderId(context.Context, *IdRequest) (*DeliveryInfoResponse, error)
GetDeliveryBySupplyId(context.Context, *IdRequest) (*DeliveryInfoResponse, error)
mustEmbedUnimplementedExpressServer()
}
@@ -343,6 +369,12 @@ func (UnimplementedExpressServer) ExpressAdminCancel(context.Context, *IdRequest
func (UnimplementedExpressServer) DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) {
return nil, status.Error(codes.Unimplemented, "method DeliveryOrderCreate not implemented")
}
func (UnimplementedExpressServer) GetDeliveryByOrderId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) {
return nil, status.Error(codes.Unimplemented, "method GetDeliveryByOrderId not implemented")
}
func (UnimplementedExpressServer) GetDeliveryBySupplyId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) {
return nil, status.Error(codes.Unimplemented, "method GetDeliveryBySupplyId not implemented")
}
func (UnimplementedExpressServer) mustEmbedUnimplementedExpressServer() {}
func (UnimplementedExpressServer) testEmbeddedByValue() {}
@@ -688,6 +720,42 @@ func _Express_DeliveryOrderCreate_Handler(srv interface{}, ctx context.Context,
return interceptor(ctx, in, info, handler)
}
func _Express_GetDeliveryByOrderId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(IdRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ExpressServer).GetDeliveryByOrderId(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: Express_GetDeliveryByOrderId_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ExpressServer).GetDeliveryByOrderId(ctx, req.(*IdRequest))
}
return interceptor(ctx, in, info, handler)
}
func _Express_GetDeliveryBySupplyId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(IdRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ExpressServer).GetDeliveryBySupplyId(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: Express_GetDeliveryBySupplyId_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ExpressServer).GetDeliveryBySupplyId(ctx, req.(*IdRequest))
}
return interceptor(ctx, in, info, handler)
}
// Express_ServiceDesc is the grpc.ServiceDesc for Express service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -767,6 +835,14 @@ var Express_ServiceDesc = grpc.ServiceDesc{
MethodName: "DeliveryOrderCreate",
Handler: _Express_DeliveryOrderCreate_Handler,
},
{
MethodName: "GetDeliveryByOrderId",
Handler: _Express_GetDeliveryByOrderId_Handler,
},
{
MethodName: "GetDeliveryBySupplyId",
Handler: _Express_GetDeliveryBySupplyId_Handler,
},
},
Streams: []grpc.StreamDesc{},
Metadata: "express/express.proto",