diff --git a/deploy/apisix/lua/auth.lua b/deploy/apisix/lua/auth.lua index 16863c0..4a48ae1 100644 --- a/deploy/apisix/lua/auth.lua +++ b/deploy/apisix/lua/auth.lua @@ -16,13 +16,12 @@ function _M.access(conf, ctx) ["/api/v3/version"] = true, ["/admin/v3/login"] = true, - ["/admin/v3/refresh"] = true, + ["/admin/v3/refresh"] = true, + ["/admin/v3/transit/bind"] = true, ["/api/v3/express/sf"] = true, ["/api/v3/express/jd"] = true, - ["/api/v3/version"] = true, - ["/api/v3/chore/oss/upload"] = true, } diff --git a/rpc/express/express.pb b/rpc/express/express.pb index 0f0f6d3..8ec4b70 100644 Binary files a/rpc/express/express.pb and b/rpc/express/express.pb differ diff --git a/rpc/express/express.proto b/rpc/express/express.proto index fc95140..c2614a2 100644 --- a/rpc/express/express.proto +++ b/rpc/express/express.proto @@ -92,7 +92,7 @@ message DeliveringRequest { int64 id = 2; } -message ExpressCompanyRequest { +message ExpressPrintCompanyRequest { string code = 1; } message IdApiRequest { @@ -100,36 +100,31 @@ message IdApiRequest { int32 type=2; } -message ApiPrintBarCodeRequest { +message PrintBarCodeRequest { int32 number = 1; int64 product_id = 2; } -message ApiPrintBarCodePrintRequest { +message PrintBarCodePrintRequest { int64 id = 1; } -message ApiPrintExpressRequest { +message PrintExpressRequest { int32 status = 1; string order_sn = 2; string time = 3; } -message ApiPrintExpressPrintRequest { +message PrintExpressPrintRequest { int64 id = 1; int64 transit_id = 2; } -message ApiPrintExpressTransitRequest { +message PrintExpressTransitRequest { string company = 1; } -message ApiLoginRequest { - string username = 1; - string password = 2; -} - -message ApiPrintBindRequest { +message PrintBindRequest { string transit_sn = 1; string transit_name = 2; } @@ -189,13 +184,6 @@ service Express { }; }; - //获取可选的打印公司 - rpc ExpressCompany(ExpressCompanyRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/express/company" - body: "*" - }; - }; //发货 rpc ExpressDelivering(DeliveringRequest) returns(Response){ option (google.api.http) = { @@ -224,6 +212,50 @@ service Express { }; }; + rpc PrintBarCode(PrintBarCodeRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/print/bar/code" + body: "*" + }; + }; + rpc PrintBarCodePrint(PrintBarCodePrintRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/print/bar/code/print" + body: "*" + }; + }; + rpc PrintExpress(PrintExpressRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/print/express" + body: "*" + }; + }; + rpc PrintExpressTransit(PrintExpressTransitRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/print/express/transit" + body: "*" + }; + }; + rpc PrintExpressPrint(PrintExpressPrintRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/print/express/print" + body: "*" + }; + }; + rpc PrintProduct(EmtpyRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/print/express/product" + body: "*" + }; + }; + //不需要登录 + rpc PrintBind(PrintBindRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/transit/bind" + body: "*" + }; + }; + /*****************API***********************/ rpc ExpressSfBack(EmtpyRequest) returns(SfResponse){ option (google.api.http) = { @@ -258,57 +290,6 @@ service Express { body: "*" }; }; - rpc ApiPrintBarCode(ApiPrintBarCodeRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/bar/code" - body: "*" - }; - }; - rpc ApiPrintBarCodePrint(ApiPrintBarCodePrintRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/bar/code/print" - body: "*" - }; - }; - rpc ApiPrintExpress(ApiPrintExpressRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/express" - body: "*" - }; - }; - rpc ApiPrintExpressTransit(ApiPrintExpressTransitRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/express/transit" - body: "*" - }; - }; - rpc ApiPrintExpressPrint(ApiPrintExpressPrintRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/express/print" - body: "*" - }; - }; - rpc ApiPrintProduct(EmtpyRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/express/product" - body: "*" - }; - }; - rpc ApiLogin(ApiLoginRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/print/login" - body: "*" - }; - }; - - //不需要登录 - rpc ApiPrintBind(ApiPrintBindRequest) returns(Response){ - option (google.api.http) = { - get: "/api/v3/transit/bind" - body: "*" - }; - }; - //添加生成订单的发货信息 rpc DeliveryOrderCreate(DeliveryOrderCreateRequest) returns(IdResponse); diff --git a/rpc/express/pb/express.pb.go b/rpc/express/pb/express.pb.go index e33023e..2e7ba3f 100644 --- a/rpc/express/pb/express.pb.go +++ b/rpc/express/pb/express.pb.go @@ -862,27 +862,27 @@ func (x *DeliveringRequest) GetId() int64 { return 0 } -type ExpressCompanyRequest struct { +type ExpressPrintCompanyRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Code string `protobuf:"bytes,1,opt,name=code,proto3" json:"code,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ExpressCompanyRequest) Reset() { - *x = ExpressCompanyRequest{} +func (x *ExpressPrintCompanyRequest) Reset() { + *x = ExpressPrintCompanyRequest{} mi := &file_express_express_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ExpressCompanyRequest) String() string { +func (x *ExpressPrintCompanyRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ExpressCompanyRequest) ProtoMessage() {} +func (*ExpressPrintCompanyRequest) ProtoMessage() {} -func (x *ExpressCompanyRequest) ProtoReflect() protoreflect.Message { +func (x *ExpressPrintCompanyRequest) ProtoReflect() protoreflect.Message { mi := &file_express_express_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -894,12 +894,12 @@ func (x *ExpressCompanyRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ExpressCompanyRequest.ProtoReflect.Descriptor instead. -func (*ExpressCompanyRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use ExpressPrintCompanyRequest.ProtoReflect.Descriptor instead. +func (*ExpressPrintCompanyRequest) Descriptor() ([]byte, []int) { return file_express_express_proto_rawDescGZIP(), []int{12} } -func (x *ExpressCompanyRequest) GetCode() string { +func (x *ExpressPrintCompanyRequest) GetCode() string { if x != nil { return x.Code } @@ -958,7 +958,7 @@ func (x *IdApiRequest) GetType() int32 { return 0 } -type ApiPrintBarCodeRequest struct { +type PrintBarCodeRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Number int32 `protobuf:"varint,1,opt,name=number,proto3" json:"number,omitempty"` ProductId int64 `protobuf:"varint,2,opt,name=product_id,json=productId,proto3" json:"product_id,omitempty"` @@ -966,20 +966,20 @@ type ApiPrintBarCodeRequest struct { sizeCache protoimpl.SizeCache } -func (x *ApiPrintBarCodeRequest) Reset() { - *x = ApiPrintBarCodeRequest{} +func (x *PrintBarCodeRequest) Reset() { + *x = PrintBarCodeRequest{} mi := &file_express_express_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ApiPrintBarCodeRequest) String() string { +func (x *PrintBarCodeRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ApiPrintBarCodeRequest) ProtoMessage() {} +func (*PrintBarCodeRequest) ProtoMessage() {} -func (x *ApiPrintBarCodeRequest) ProtoReflect() protoreflect.Message { +func (x *PrintBarCodeRequest) ProtoReflect() protoreflect.Message { mi := &file_express_express_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -991,46 +991,46 @@ func (x *ApiPrintBarCodeRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ApiPrintBarCodeRequest.ProtoReflect.Descriptor instead. -func (*ApiPrintBarCodeRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use PrintBarCodeRequest.ProtoReflect.Descriptor instead. +func (*PrintBarCodeRequest) Descriptor() ([]byte, []int) { return file_express_express_proto_rawDescGZIP(), []int{14} } -func (x *ApiPrintBarCodeRequest) GetNumber() int32 { +func (x *PrintBarCodeRequest) GetNumber() int32 { if x != nil { return x.Number } return 0 } -func (x *ApiPrintBarCodeRequest) GetProductId() int64 { +func (x *PrintBarCodeRequest) GetProductId() int64 { if x != nil { return x.ProductId } return 0 } -type ApiPrintBarCodePrintRequest struct { +type PrintBarCodePrintRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ApiPrintBarCodePrintRequest) Reset() { - *x = ApiPrintBarCodePrintRequest{} +func (x *PrintBarCodePrintRequest) Reset() { + *x = PrintBarCodePrintRequest{} mi := &file_express_express_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ApiPrintBarCodePrintRequest) String() string { +func (x *PrintBarCodePrintRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ApiPrintBarCodePrintRequest) ProtoMessage() {} +func (*PrintBarCodePrintRequest) ProtoMessage() {} -func (x *ApiPrintBarCodePrintRequest) ProtoReflect() protoreflect.Message { +func (x *PrintBarCodePrintRequest) ProtoReflect() protoreflect.Message { mi := &file_express_express_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1042,19 +1042,19 @@ func (x *ApiPrintBarCodePrintRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ApiPrintBarCodePrintRequest.ProtoReflect.Descriptor instead. -func (*ApiPrintBarCodePrintRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use PrintBarCodePrintRequest.ProtoReflect.Descriptor instead. +func (*PrintBarCodePrintRequest) Descriptor() ([]byte, []int) { return file_express_express_proto_rawDescGZIP(), []int{15} } -func (x *ApiPrintBarCodePrintRequest) GetId() int64 { +func (x *PrintBarCodePrintRequest) GetId() int64 { if x != nil { return x.Id } return 0 } -type ApiPrintExpressRequest struct { +type PrintExpressRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Status int32 `protobuf:"varint,1,opt,name=status,proto3" json:"status,omitempty"` OrderSn string `protobuf:"bytes,2,opt,name=order_sn,json=orderSn,proto3" json:"order_sn,omitempty"` @@ -1063,20 +1063,20 @@ type ApiPrintExpressRequest struct { sizeCache protoimpl.SizeCache } -func (x *ApiPrintExpressRequest) Reset() { - *x = ApiPrintExpressRequest{} +func (x *PrintExpressRequest) Reset() { + *x = PrintExpressRequest{} mi := &file_express_express_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ApiPrintExpressRequest) String() string { +func (x *PrintExpressRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ApiPrintExpressRequest) ProtoMessage() {} +func (*PrintExpressRequest) ProtoMessage() {} -func (x *ApiPrintExpressRequest) ProtoReflect() protoreflect.Message { +func (x *PrintExpressRequest) ProtoReflect() protoreflect.Message { mi := &file_express_express_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1088,33 +1088,33 @@ func (x *ApiPrintExpressRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ApiPrintExpressRequest.ProtoReflect.Descriptor instead. -func (*ApiPrintExpressRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use PrintExpressRequest.ProtoReflect.Descriptor instead. +func (*PrintExpressRequest) Descriptor() ([]byte, []int) { return file_express_express_proto_rawDescGZIP(), []int{16} } -func (x *ApiPrintExpressRequest) GetStatus() int32 { +func (x *PrintExpressRequest) GetStatus() int32 { if x != nil { return x.Status } return 0 } -func (x *ApiPrintExpressRequest) GetOrderSn() string { +func (x *PrintExpressRequest) GetOrderSn() string { if x != nil { return x.OrderSn } return "" } -func (x *ApiPrintExpressRequest) GetTime() string { +func (x *PrintExpressRequest) GetTime() string { if x != nil { return x.Time } return "" } -type ApiPrintExpressPrintRequest struct { +type PrintExpressPrintRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` TransitId int64 `protobuf:"varint,2,opt,name=transit_id,json=transitId,proto3" json:"transit_id,omitempty"` @@ -1122,20 +1122,20 @@ type ApiPrintExpressPrintRequest struct { sizeCache protoimpl.SizeCache } -func (x *ApiPrintExpressPrintRequest) Reset() { - *x = ApiPrintExpressPrintRequest{} +func (x *PrintExpressPrintRequest) Reset() { + *x = PrintExpressPrintRequest{} mi := &file_express_express_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ApiPrintExpressPrintRequest) String() string { +func (x *PrintExpressPrintRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ApiPrintExpressPrintRequest) ProtoMessage() {} +func (*PrintExpressPrintRequest) ProtoMessage() {} -func (x *ApiPrintExpressPrintRequest) ProtoReflect() protoreflect.Message { +func (x *PrintExpressPrintRequest) ProtoReflect() protoreflect.Message { mi := &file_express_express_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1147,46 +1147,46 @@ func (x *ApiPrintExpressPrintRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ApiPrintExpressPrintRequest.ProtoReflect.Descriptor instead. -func (*ApiPrintExpressPrintRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use PrintExpressPrintRequest.ProtoReflect.Descriptor instead. +func (*PrintExpressPrintRequest) Descriptor() ([]byte, []int) { return file_express_express_proto_rawDescGZIP(), []int{17} } -func (x *ApiPrintExpressPrintRequest) GetId() int64 { +func (x *PrintExpressPrintRequest) GetId() int64 { if x != nil { return x.Id } return 0 } -func (x *ApiPrintExpressPrintRequest) GetTransitId() int64 { +func (x *PrintExpressPrintRequest) GetTransitId() int64 { if x != nil { return x.TransitId } return 0 } -type ApiPrintExpressTransitRequest struct { +type PrintExpressTransitRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Company string `protobuf:"bytes,1,opt,name=company,proto3" json:"company,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } -func (x *ApiPrintExpressTransitRequest) Reset() { - *x = ApiPrintExpressTransitRequest{} +func (x *PrintExpressTransitRequest) Reset() { + *x = PrintExpressTransitRequest{} mi := &file_express_express_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ApiPrintExpressTransitRequest) String() string { +func (x *PrintExpressTransitRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ApiPrintExpressTransitRequest) ProtoMessage() {} +func (*PrintExpressTransitRequest) ProtoMessage() {} -func (x *ApiPrintExpressTransitRequest) ProtoReflect() protoreflect.Message { +func (x *PrintExpressTransitRequest) ProtoReflect() protoreflect.Message { mi := &file_express_express_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1198,71 +1198,19 @@ func (x *ApiPrintExpressTransitRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ApiPrintExpressTransitRequest.ProtoReflect.Descriptor instead. -func (*ApiPrintExpressTransitRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use PrintExpressTransitRequest.ProtoReflect.Descriptor instead. +func (*PrintExpressTransitRequest) Descriptor() ([]byte, []int) { return file_express_express_proto_rawDescGZIP(), []int{18} } -func (x *ApiPrintExpressTransitRequest) GetCompany() string { +func (x *PrintExpressTransitRequest) GetCompany() string { if x != nil { return x.Company } return "" } -type ApiLoginRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ApiLoginRequest) Reset() { - *x = ApiLoginRequest{} - mi := &file_express_express_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ApiLoginRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ApiLoginRequest) ProtoMessage() {} - -func (x *ApiLoginRequest) ProtoReflect() protoreflect.Message { - mi := &file_express_express_proto_msgTypes[19] - 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 ApiLoginRequest.ProtoReflect.Descriptor instead. -func (*ApiLoginRequest) Descriptor() ([]byte, []int) { - return file_express_express_proto_rawDescGZIP(), []int{19} -} - -func (x *ApiLoginRequest) GetUsername() string { - if x != nil { - return x.Username - } - return "" -} - -func (x *ApiLoginRequest) GetPassword() string { - if x != nil { - return x.Password - } - return "" -} - -type ApiPrintBindRequest struct { +type PrintBindRequest struct { state protoimpl.MessageState `protogen:"open.v1"` TransitSn string `protobuf:"bytes,1,opt,name=transit_sn,json=transitSn,proto3" json:"transit_sn,omitempty"` TransitName string `protobuf:"bytes,2,opt,name=transit_name,json=transitName,proto3" json:"transit_name,omitempty"` @@ -1270,21 +1218,21 @@ type ApiPrintBindRequest struct { sizeCache protoimpl.SizeCache } -func (x *ApiPrintBindRequest) Reset() { - *x = ApiPrintBindRequest{} - mi := &file_express_express_proto_msgTypes[20] +func (x *PrintBindRequest) Reset() { + *x = PrintBindRequest{} + mi := &file_express_express_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } -func (x *ApiPrintBindRequest) String() string { +func (x *PrintBindRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ApiPrintBindRequest) ProtoMessage() {} +func (*PrintBindRequest) ProtoMessage() {} -func (x *ApiPrintBindRequest) ProtoReflect() protoreflect.Message { - mi := &file_express_express_proto_msgTypes[20] +func (x *PrintBindRequest) ProtoReflect() protoreflect.Message { + mi := &file_express_express_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1295,19 +1243,19 @@ func (x *ApiPrintBindRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ApiPrintBindRequest.ProtoReflect.Descriptor instead. -func (*ApiPrintBindRequest) Descriptor() ([]byte, []int) { - return file_express_express_proto_rawDescGZIP(), []int{20} +// Deprecated: Use PrintBindRequest.ProtoReflect.Descriptor instead. +func (*PrintBindRequest) Descriptor() ([]byte, []int) { + return file_express_express_proto_rawDescGZIP(), []int{19} } -func (x *ApiPrintBindRequest) GetTransitSn() string { +func (x *PrintBindRequest) GetTransitSn() string { if x != nil { return x.TransitSn } return "" } -func (x *ApiPrintBindRequest) GetTransitName() string { +func (x *PrintBindRequest) GetTransitName() string { if x != nil { return x.TransitName } @@ -1328,7 +1276,7 @@ type DeliveryInfoResponse struct { func (x *DeliveryInfoResponse) Reset() { *x = DeliveryInfoResponse{} - mi := &file_express_express_proto_msgTypes[21] + mi := &file_express_express_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1340,7 +1288,7 @@ func (x *DeliveryInfoResponse) String() string { func (*DeliveryInfoResponse) ProtoMessage() {} func (x *DeliveryInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_express_express_proto_msgTypes[21] + mi := &file_express_express_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1353,7 +1301,7 @@ func (x *DeliveryInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use DeliveryInfoResponse.ProtoReflect.Descriptor instead. func (*DeliveryInfoResponse) Descriptor() ([]byte, []int) { - return file_express_express_proto_rawDescGZIP(), []int{21} + return file_express_express_proto_rawDescGZIP(), []int{20} } func (x *DeliveryInfoResponse) GetTransitName() string { @@ -1475,32 +1423,29 @@ const file_express_express_proto_rawDesc = "" + "\x11DeliveringRequest\x12\x1d\n" + "\n" + "transit_id\x18\x01 \x01(\x03R\ttransitId\x12\x0e\n" + - "\x02id\x18\x02 \x01(\x03R\x02id\"+\n" + - "\x15ExpressCompanyRequest\x12\x12\n" + + "\x02id\x18\x02 \x01(\x03R\x02id\"0\n" + + "\x1aExpressPrintCompanyRequest\x12\x12\n" + "\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\x04type\"O\n" + - "\x16ApiPrintBarCodeRequest\x12\x16\n" + + "\x04type\x18\x02 \x01(\x05R\x04type\"L\n" + + "\x13PrintBarCodeRequest\x12\x16\n" + "\x06number\x18\x01 \x01(\x05R\x06number\x12\x1d\n" + "\n" + - "product_id\x18\x02 \x01(\x03R\tproductId\"-\n" + - "\x1bApiPrintBarCodePrintRequest\x12\x0e\n" + - "\x02id\x18\x01 \x01(\x03R\x02id\"_\n" + - "\x16ApiPrintExpressRequest\x12\x16\n" + + "product_id\x18\x02 \x01(\x03R\tproductId\"*\n" + + "\x18PrintBarCodePrintRequest\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"\\\n" + + "\x13PrintExpressRequest\x12\x16\n" + "\x06status\x18\x01 \x01(\x05R\x06status\x12\x19\n" + "\border_sn\x18\x02 \x01(\tR\aorderSn\x12\x12\n" + - "\x04time\x18\x03 \x01(\tR\x04time\"L\n" + - "\x1bApiPrintExpressPrintRequest\x12\x0e\n" + + "\x04time\x18\x03 \x01(\tR\x04time\"I\n" + + "\x18PrintExpressPrintRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1d\n" + "\n" + - "transit_id\x18\x02 \x01(\x03R\ttransitId\"9\n" + - "\x1dApiPrintExpressTransitRequest\x12\x18\n" + - "\acompany\x18\x01 \x01(\tR\acompany\"I\n" + - "\x0fApiLoginRequest\x12\x1a\n" + - "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + - "\bpassword\x18\x02 \x01(\tR\bpassword\"W\n" + - "\x13ApiPrintBindRequest\x12\x1d\n" + + "transit_id\x18\x02 \x01(\x03R\ttransitId\"6\n" + + "\x1aPrintExpressTransitRequest\x12\x18\n" + + "\acompany\x18\x01 \x01(\tR\acompany\"T\n" + + "\x10PrintBindRequest\x12\x1d\n" + "\n" + "transit_sn\x18\x01 \x01(\tR\ttransitSn\x12!\n" + "\ftransit_name\x18\x02 \x01(\tR\vtransitName\"\xcc\x01\n" + @@ -1511,7 +1456,7 @@ const file_express_express_proto_rawDesc = "" + "\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\x9e\x15\n" + + "\x02id\x18\x06 \x01(\x03R\x02id2\xc1\x13\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" + @@ -1519,25 +1464,23 @@ const file_express_express_proto_rawDesc = "" + "\x04Info\x12\x12.express.IdRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/admin/v3/express/info\x12U\n" + "\x05Names\x12\x15.express.EmtpyRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/express/names\x12X\n" + "\x06Status\x12\x16.express.StatusRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/express/status\x12\\\n" + - "\aHistory\x12\x17.express.HistoryRequest\x1a\x11.express.Response\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\x12\x1a/admin/v3/delivery/history\x12i\n" + - "\x0eExpressCompany\x12\x1e.express.ExpressCompanyRequest\x1a\x11.express.Response\"$\x82\xd3\xe4\x93\x02\x1e:\x01*\x12\x19/admin/v3/express/company\x12k\n" + + "\aHistory\x12\x17.express.HistoryRequest\x1a\x11.express.Response\"%\x82\xd3\xe4\x93\x02\x1f:\x01*\x12\x1a/admin/v3/delivery/history\x12k\n" + "\x11ExpressDelivering\x12\x1a.express.DeliveringRequest\x1a\x11.express.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/admin/v3/express/delivering\x12`\n" + "\x12ExpressAdminCancel\x12\x12.express.IdRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x12\x18/admin/v3/express/cancel\x12^\n" + "\x11ExpressAdminQuery\x12\x12.express.IdRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/express/query\x12f\n" + - "\x15ExpressAdminEstimated\x12\x12.express.IdRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/admin/v3/express/estimated\x12Z\n" + + "\x15ExpressAdminEstimated\x12\x12.express.IdRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/admin/v3/express/estimated\x12d\n" + + "\fPrintBarCode\x12\x1c.express.PrintBarCodeRequest\x1a\x11.express.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x12\x18/admin/v3/print/bar/code\x12t\n" + + "\x11PrintBarCodePrint\x12!.express.PrintBarCodePrintRequest\x1a\x11.express.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/admin/v3/print/bar/code/print\x12c\n" + + "\fPrintExpress\x12\x1c.express.PrintExpressRequest\x1a\x11.express.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/print/express\x12y\n" + + "\x13PrintExpressTransit\x12#.express.PrintExpressTransitRequest\x1a\x11.express.Response\"*\x82\xd3\xe4\x93\x02$:\x01*\x12\x1f/admin/v3/print/express/transit\x12s\n" + + "\x11PrintExpressPrint\x12!.express.PrintExpressPrintRequest\x1a\x11.express.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/admin/v3/print/express/print\x12d\n" + + "\fPrintProduct\x12\x15.express.EmtpyRequest\x1a\x11.express.Response\"*\x82\xd3\xe4\x93\x02$:\x01*\x12\x1f/admin/v3/print/express/product\x12\\\n" + + "\tPrintBind\x12\x19.express.PrintBindRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/admin/v3/transit/bind\x12Z\n" + "\rExpressSfBack\x12\x15.express.EmtpyRequest\x1a\x13.express.SfResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v3/express/sf\x12W\n" + "\rExpressJdBack\x12\x12.express.JdRequest\x1a\x13.express.SfResponse\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\"\x12/api/v3/express/jd\x12]\n" + "\x0fExpressApiQuery\x12\x15.express.IdApiRequest\x1a\x11.express.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/api/v3/express/query\x12e\n" + "\x13ExpressApiEstimated\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"$\x82\xd3\xe4\x93\x02\x1e:\x01*\x12\x19/api/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\x12h\n" + - "\x0fApiPrintBarCode\x12\x1f.express.ApiPrintBarCodeRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/api/v3/print/bar/code\x12x\n" + - "\x14ApiPrintBarCodePrint\x12$.express.ApiPrintBarCodePrintRequest\x1a\x11.express.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\x12\x1c/api/v3/print/bar/code/print\x12g\n" + - "\x0fApiPrintExpress\x12\x1f.express.ApiPrintExpressRequest\x1a\x11.express.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/api/v3/print/express\x12}\n" + - "\x16ApiPrintExpressTransit\x12&.express.ApiPrintExpressTransitRequest\x1a\x11.express.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/api/v3/print/express/transit\x12w\n" + - "\x14ApiPrintExpressPrint\x12$.express.ApiPrintExpressPrintRequest\x1a\x11.express.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/api/v3/print/express/print\x12e\n" + - "\x0fApiPrintProduct\x12\x15.express.EmtpyRequest\x1a\x11.express.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/api/v3/print/express/product\x12W\n" + - "\bApiLogin\x12\x18.express.ApiLoginRequest\x1a\x11.express.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\x12\x13/api/v3/print/login\x12`\n" + - "\fApiPrintBind\x12\x1c.express.ApiPrintBindRequest\x1a\x11.express.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/api/v3/transit/bind\x12O\n" + + "\x10ExpressApiCancel\x12\x15.express.IdApiRequest\x1a\x11.express.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/api/v3/express/cancel\x12O\n" + "\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" @@ -1554,30 +1497,29 @@ func file_express_express_proto_rawDescGZIP() []byte { return file_express_express_proto_rawDescData } -var file_express_express_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_express_express_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_express_express_proto_goTypes = []any{ - (*Response)(nil), // 0: express.Response - (*SfResponse)(nil), // 1: express.SfResponse - (*IdResponse)(nil), // 2: express.IdResponse - (*EmtpyRequest)(nil), // 3: express.EmtpyRequest - (*JdRequest)(nil), // 4: express.JdRequest - (*CreateRequest)(nil), // 5: express.CreateRequest - (*IdRequest)(nil), // 6: express.IdRequest - (*StatusRequest)(nil), // 7: express.StatusRequest - (*HistoryRequest)(nil), // 8: express.HistoryRequest - (*DeliveryOrderCreateRequest)(nil), // 9: express.DeliveryOrderCreateRequest - (*DeliverOrderProductInfo)(nil), // 10: express.DeliverOrderProductInfo - (*DeliveringRequest)(nil), // 11: express.DeliveringRequest - (*ExpressCompanyRequest)(nil), // 12: express.ExpressCompanyRequest - (*IdApiRequest)(nil), // 13: express.IdApiRequest - (*ApiPrintBarCodeRequest)(nil), // 14: express.ApiPrintBarCodeRequest - (*ApiPrintBarCodePrintRequest)(nil), // 15: express.ApiPrintBarCodePrintRequest - (*ApiPrintExpressRequest)(nil), // 16: express.ApiPrintExpressRequest - (*ApiPrintExpressPrintRequest)(nil), // 17: express.ApiPrintExpressPrintRequest - (*ApiPrintExpressTransitRequest)(nil), // 18: express.ApiPrintExpressTransitRequest - (*ApiLoginRequest)(nil), // 19: express.ApiLoginRequest - (*ApiPrintBindRequest)(nil), // 20: express.ApiPrintBindRequest - (*DeliveryInfoResponse)(nil), // 21: express.DeliveryInfoResponse + (*Response)(nil), // 0: express.Response + (*SfResponse)(nil), // 1: express.SfResponse + (*IdResponse)(nil), // 2: express.IdResponse + (*EmtpyRequest)(nil), // 3: express.EmtpyRequest + (*JdRequest)(nil), // 4: express.JdRequest + (*CreateRequest)(nil), // 5: express.CreateRequest + (*IdRequest)(nil), // 6: express.IdRequest + (*StatusRequest)(nil), // 7: express.StatusRequest + (*HistoryRequest)(nil), // 8: express.HistoryRequest + (*DeliveryOrderCreateRequest)(nil), // 9: express.DeliveryOrderCreateRequest + (*DeliverOrderProductInfo)(nil), // 10: express.DeliverOrderProductInfo + (*DeliveringRequest)(nil), // 11: express.DeliveringRequest + (*ExpressPrintCompanyRequest)(nil), // 12: express.ExpressPrintCompanyRequest + (*IdApiRequest)(nil), // 13: express.IdApiRequest + (*PrintBarCodeRequest)(nil), // 14: express.PrintBarCodeRequest + (*PrintBarCodePrintRequest)(nil), // 15: express.PrintBarCodePrintRequest + (*PrintExpressRequest)(nil), // 16: express.PrintExpressRequest + (*PrintExpressPrintRequest)(nil), // 17: express.PrintExpressPrintRequest + (*PrintExpressTransitRequest)(nil), // 18: express.PrintExpressTransitRequest + (*PrintBindRequest)(nil), // 19: express.PrintBindRequest + (*DeliveryInfoResponse)(nil), // 20: express.DeliveryInfoResponse } var file_express_express_proto_depIdxs = []int32{ 10, // 0: express.DeliveryOrderCreateRequest.product_info:type_name -> express.DeliverOrderProductInfo @@ -1588,57 +1530,53 @@ var file_express_express_proto_depIdxs = []int32{ 3, // 5: express.Express.Names:input_type -> express.EmtpyRequest 7, // 6: express.Express.Status:input_type -> express.StatusRequest 8, // 7: express.Express.History:input_type -> express.HistoryRequest - 12, // 8: express.Express.ExpressCompany:input_type -> express.ExpressCompanyRequest - 11, // 9: express.Express.ExpressDelivering:input_type -> express.DeliveringRequest - 6, // 10: express.Express.ExpressAdminCancel:input_type -> express.IdRequest - 6, // 11: express.Express.ExpressAdminQuery:input_type -> express.IdRequest - 6, // 12: express.Express.ExpressAdminEstimated:input_type -> express.IdRequest - 3, // 13: express.Express.ExpressSfBack:input_type -> express.EmtpyRequest - 4, // 14: express.Express.ExpressJdBack:input_type -> express.JdRequest - 13, // 15: express.Express.ExpressApiQuery:input_type -> express.IdApiRequest - 13, // 16: express.Express.ExpressApiEstimated:input_type -> express.IdApiRequest - 13, // 17: express.Express.ExpressApiCancel:input_type -> express.IdApiRequest - 14, // 18: express.Express.ApiPrintBarCode:input_type -> express.ApiPrintBarCodeRequest - 15, // 19: express.Express.ApiPrintBarCodePrint:input_type -> express.ApiPrintBarCodePrintRequest - 16, // 20: express.Express.ApiPrintExpress:input_type -> express.ApiPrintExpressRequest - 18, // 21: express.Express.ApiPrintExpressTransit:input_type -> express.ApiPrintExpressTransitRequest - 17, // 22: express.Express.ApiPrintExpressPrint:input_type -> express.ApiPrintExpressPrintRequest - 3, // 23: express.Express.ApiPrintProduct:input_type -> express.EmtpyRequest - 19, // 24: express.Express.ApiLogin:input_type -> express.ApiLoginRequest - 20, // 25: express.Express.ApiPrintBind:input_type -> express.ApiPrintBindRequest - 9, // 26: express.Express.DeliveryOrderCreate:input_type -> express.DeliveryOrderCreateRequest - 6, // 27: express.Express.GetDeliveryByOrderId:input_type -> express.IdRequest - 6, // 28: express.Express.GetDeliveryBySupplyId:input_type -> express.IdRequest - 0, // 29: express.Express.Items:output_type -> express.Response - 0, // 30: express.Express.Create:output_type -> express.Response - 0, // 31: express.Express.Edit:output_type -> express.Response - 0, // 32: express.Express.Info:output_type -> express.Response - 0, // 33: express.Express.Names:output_type -> express.Response - 0, // 34: express.Express.Status:output_type -> express.Response - 0, // 35: express.Express.History:output_type -> express.Response - 0, // 36: express.Express.ExpressCompany:output_type -> express.Response - 0, // 37: express.Express.ExpressDelivering:output_type -> express.Response - 0, // 38: express.Express.ExpressAdminCancel:output_type -> express.Response - 0, // 39: express.Express.ExpressAdminQuery:output_type -> express.Response - 0, // 40: express.Express.ExpressAdminEstimated:output_type -> express.Response - 1, // 41: express.Express.ExpressSfBack:output_type -> express.SfResponse - 1, // 42: express.Express.ExpressJdBack:output_type -> express.SfResponse - 0, // 43: express.Express.ExpressApiQuery:output_type -> express.Response - 0, // 44: express.Express.ExpressApiEstimated:output_type -> express.Response - 0, // 45: express.Express.ExpressApiCancel:output_type -> express.Response - 0, // 46: express.Express.ApiPrintBarCode:output_type -> express.Response - 0, // 47: express.Express.ApiPrintBarCodePrint:output_type -> express.Response - 0, // 48: express.Express.ApiPrintExpress:output_type -> express.Response - 0, // 49: express.Express.ApiPrintExpressTransit:output_type -> express.Response - 0, // 50: express.Express.ApiPrintExpressPrint:output_type -> express.Response - 0, // 51: express.Express.ApiPrintProduct:output_type -> express.Response - 0, // 52: express.Express.ApiLogin:output_type -> express.Response - 0, // 53: express.Express.ApiPrintBind:output_type -> express.Response - 2, // 54: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse - 21, // 55: express.Express.GetDeliveryByOrderId:output_type -> express.DeliveryInfoResponse - 21, // 56: express.Express.GetDeliveryBySupplyId:output_type -> express.DeliveryInfoResponse - 29, // [29:57] is the sub-list for method output_type - 1, // [1:29] is the sub-list for method input_type + 11, // 8: express.Express.ExpressDelivering:input_type -> express.DeliveringRequest + 6, // 9: express.Express.ExpressAdminCancel:input_type -> express.IdRequest + 6, // 10: express.Express.ExpressAdminQuery:input_type -> express.IdRequest + 6, // 11: express.Express.ExpressAdminEstimated:input_type -> express.IdRequest + 14, // 12: express.Express.PrintBarCode:input_type -> express.PrintBarCodeRequest + 15, // 13: express.Express.PrintBarCodePrint:input_type -> express.PrintBarCodePrintRequest + 16, // 14: express.Express.PrintExpress:input_type -> express.PrintExpressRequest + 18, // 15: express.Express.PrintExpressTransit:input_type -> express.PrintExpressTransitRequest + 17, // 16: express.Express.PrintExpressPrint:input_type -> express.PrintExpressPrintRequest + 3, // 17: express.Express.PrintProduct:input_type -> express.EmtpyRequest + 19, // 18: express.Express.PrintBind:input_type -> express.PrintBindRequest + 3, // 19: express.Express.ExpressSfBack:input_type -> express.EmtpyRequest + 4, // 20: express.Express.ExpressJdBack:input_type -> express.JdRequest + 13, // 21: express.Express.ExpressApiQuery:input_type -> express.IdApiRequest + 13, // 22: express.Express.ExpressApiEstimated:input_type -> express.IdApiRequest + 13, // 23: express.Express.ExpressApiCancel:input_type -> express.IdApiRequest + 9, // 24: express.Express.DeliveryOrderCreate:input_type -> express.DeliveryOrderCreateRequest + 6, // 25: express.Express.GetDeliveryByOrderId:input_type -> express.IdRequest + 6, // 26: express.Express.GetDeliveryBySupplyId:input_type -> express.IdRequest + 0, // 27: express.Express.Items:output_type -> express.Response + 0, // 28: express.Express.Create:output_type -> express.Response + 0, // 29: express.Express.Edit:output_type -> express.Response + 0, // 30: express.Express.Info:output_type -> express.Response + 0, // 31: express.Express.Names:output_type -> express.Response + 0, // 32: express.Express.Status:output_type -> express.Response + 0, // 33: express.Express.History:output_type -> express.Response + 0, // 34: express.Express.ExpressDelivering:output_type -> express.Response + 0, // 35: express.Express.ExpressAdminCancel:output_type -> express.Response + 0, // 36: express.Express.ExpressAdminQuery:output_type -> express.Response + 0, // 37: express.Express.ExpressAdminEstimated:output_type -> express.Response + 0, // 38: express.Express.PrintBarCode:output_type -> express.Response + 0, // 39: express.Express.PrintBarCodePrint:output_type -> express.Response + 0, // 40: express.Express.PrintExpress:output_type -> express.Response + 0, // 41: express.Express.PrintExpressTransit:output_type -> express.Response + 0, // 42: express.Express.PrintExpressPrint:output_type -> express.Response + 0, // 43: express.Express.PrintProduct:output_type -> express.Response + 0, // 44: express.Express.PrintBind:output_type -> express.Response + 1, // 45: express.Express.ExpressSfBack:output_type -> express.SfResponse + 1, // 46: express.Express.ExpressJdBack:output_type -> express.SfResponse + 0, // 47: express.Express.ExpressApiQuery:output_type -> express.Response + 0, // 48: express.Express.ExpressApiEstimated:output_type -> express.Response + 0, // 49: express.Express.ExpressApiCancel:output_type -> express.Response + 2, // 50: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse + 20, // 51: express.Express.GetDeliveryByOrderId:output_type -> express.DeliveryInfoResponse + 20, // 52: express.Express.GetDeliveryBySupplyId:output_type -> express.DeliveryInfoResponse + 27, // [27:53] is the sub-list for method output_type + 1, // [1:27] 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 @@ -1655,7 +1593,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: 22, + NumMessages: 21, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/express/pb/express_grpc.pb.go b/rpc/express/pb/express_grpc.pb.go index 0d2d17a..588ca9b 100644 --- a/rpc/express/pb/express_grpc.pb.go +++ b/rpc/express/pb/express_grpc.pb.go @@ -19,34 +19,32 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Express_Items_FullMethodName = "/express.Express/Items" - Express_Create_FullMethodName = "/express.Express/Create" - Express_Edit_FullMethodName = "/express.Express/Edit" - Express_Info_FullMethodName = "/express.Express/Info" - Express_Names_FullMethodName = "/express.Express/Names" - Express_Status_FullMethodName = "/express.Express/Status" - Express_History_FullMethodName = "/express.Express/History" - Express_ExpressCompany_FullMethodName = "/express.Express/ExpressCompany" - Express_ExpressDelivering_FullMethodName = "/express.Express/ExpressDelivering" - Express_ExpressAdminCancel_FullMethodName = "/express.Express/ExpressAdminCancel" - Express_ExpressAdminQuery_FullMethodName = "/express.Express/ExpressAdminQuery" - Express_ExpressAdminEstimated_FullMethodName = "/express.Express/ExpressAdminEstimated" - Express_ExpressSfBack_FullMethodName = "/express.Express/ExpressSfBack" - Express_ExpressJdBack_FullMethodName = "/express.Express/ExpressJdBack" - Express_ExpressApiQuery_FullMethodName = "/express.Express/ExpressApiQuery" - Express_ExpressApiEstimated_FullMethodName = "/express.Express/ExpressApiEstimated" - Express_ExpressApiCancel_FullMethodName = "/express.Express/ExpressApiCancel" - Express_ApiPrintBarCode_FullMethodName = "/express.Express/ApiPrintBarCode" - Express_ApiPrintBarCodePrint_FullMethodName = "/express.Express/ApiPrintBarCodePrint" - Express_ApiPrintExpress_FullMethodName = "/express.Express/ApiPrintExpress" - Express_ApiPrintExpressTransit_FullMethodName = "/express.Express/ApiPrintExpressTransit" - Express_ApiPrintExpressPrint_FullMethodName = "/express.Express/ApiPrintExpressPrint" - Express_ApiPrintProduct_FullMethodName = "/express.Express/ApiPrintProduct" - Express_ApiLogin_FullMethodName = "/express.Express/ApiLogin" - Express_ApiPrintBind_FullMethodName = "/express.Express/ApiPrintBind" - Express_DeliveryOrderCreate_FullMethodName = "/express.Express/DeliveryOrderCreate" - Express_GetDeliveryByOrderId_FullMethodName = "/express.Express/GetDeliveryByOrderId" - Express_GetDeliveryBySupplyId_FullMethodName = "/express.Express/GetDeliveryBySupplyId" + Express_Items_FullMethodName = "/express.Express/Items" + Express_Create_FullMethodName = "/express.Express/Create" + Express_Edit_FullMethodName = "/express.Express/Edit" + Express_Info_FullMethodName = "/express.Express/Info" + Express_Names_FullMethodName = "/express.Express/Names" + Express_Status_FullMethodName = "/express.Express/Status" + Express_History_FullMethodName = "/express.Express/History" + Express_ExpressDelivering_FullMethodName = "/express.Express/ExpressDelivering" + Express_ExpressAdminCancel_FullMethodName = "/express.Express/ExpressAdminCancel" + Express_ExpressAdminQuery_FullMethodName = "/express.Express/ExpressAdminQuery" + Express_ExpressAdminEstimated_FullMethodName = "/express.Express/ExpressAdminEstimated" + Express_PrintBarCode_FullMethodName = "/express.Express/PrintBarCode" + Express_PrintBarCodePrint_FullMethodName = "/express.Express/PrintBarCodePrint" + Express_PrintExpress_FullMethodName = "/express.Express/PrintExpress" + Express_PrintExpressTransit_FullMethodName = "/express.Express/PrintExpressTransit" + Express_PrintExpressPrint_FullMethodName = "/express.Express/PrintExpressPrint" + Express_PrintProduct_FullMethodName = "/express.Express/PrintProduct" + Express_PrintBind_FullMethodName = "/express.Express/PrintBind" + Express_ExpressSfBack_FullMethodName = "/express.Express/ExpressSfBack" + Express_ExpressJdBack_FullMethodName = "/express.Express/ExpressJdBack" + Express_ExpressApiQuery_FullMethodName = "/express.Express/ExpressApiQuery" + Express_ExpressApiEstimated_FullMethodName = "/express.Express/ExpressApiEstimated" + Express_ExpressApiCancel_FullMethodName = "/express.Express/ExpressApiCancel" + 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. @@ -60,28 +58,25 @@ type ExpressClient interface { Names(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) History(ctx context.Context, in *HistoryRequest, opts ...grpc.CallOption) (*Response, error) - // 获取可选的打印公司 - ExpressCompany(ctx context.Context, in *ExpressCompanyRequest, opts ...grpc.CallOption) (*Response, error) // 发货 ExpressDelivering(ctx context.Context, in *DeliveringRequest, opts ...grpc.CallOption) (*Response, error) ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + PrintBarCode(ctx context.Context, in *PrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) + PrintBarCodePrint(ctx context.Context, in *PrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) + PrintExpress(ctx context.Context, in *PrintExpressRequest, opts ...grpc.CallOption) (*Response, error) + PrintExpressTransit(ctx context.Context, in *PrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) + PrintExpressPrint(ctx context.Context, in *PrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) + PrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) + // 不需要登录 + PrintBind(ctx context.Context, in *PrintBindRequest, opts ...grpc.CallOption) (*Response, error) // ****************API********************** ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressJdBack(ctx context.Context, in *JdRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressApiQuery(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiEstimated(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiCancel(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) - ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) - // 不需要登录 - ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, 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) @@ -166,16 +161,6 @@ func (c *expressClient) History(ctx context.Context, in *HistoryRequest, opts .. return out, nil } -func (c *expressClient) ExpressCompany(ctx context.Context, in *ExpressCompanyRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ExpressCompany_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *expressClient) ExpressDelivering(ctx context.Context, in *DeliveringRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -216,6 +201,76 @@ func (c *expressClient) ExpressAdminEstimated(ctx context.Context, in *IdRequest return out, nil } +func (c *expressClient) PrintBarCode(ctx context.Context, in *PrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintBarCode_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) PrintBarCodePrint(ctx context.Context, in *PrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintBarCodePrint_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) PrintExpress(ctx context.Context, in *PrintExpressRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintExpress_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) PrintExpressTransit(ctx context.Context, in *PrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintExpressTransit_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) PrintExpressPrint(ctx context.Context, in *PrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintExpressPrint_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) PrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintProduct_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) PrintBind(ctx context.Context, in *PrintBindRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Express_PrintBind_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *expressClient) ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SfResponse) @@ -266,86 +321,6 @@ func (c *expressClient) ExpressApiCancel(ctx context.Context, in *IdApiRequest, return out, nil } -func (c *expressClient) ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintBarCode_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintBarCodePrint_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintExpress_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintExpressTransit_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintExpressPrint_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintProduct_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiLogin_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *expressClient) ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Express_ApiPrintBind_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *expressClient) DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(IdResponse) @@ -387,28 +362,25 @@ type ExpressServer interface { Names(context.Context, *EmtpyRequest) (*Response, error) Status(context.Context, *StatusRequest) (*Response, error) History(context.Context, *HistoryRequest) (*Response, error) - // 获取可选的打印公司 - ExpressCompany(context.Context, *ExpressCompanyRequest) (*Response, error) // 发货 ExpressDelivering(context.Context, *DeliveringRequest) (*Response, error) ExpressAdminCancel(context.Context, *IdRequest) (*Response, error) ExpressAdminQuery(context.Context, *IdRequest) (*Response, error) ExpressAdminEstimated(context.Context, *IdRequest) (*Response, error) + PrintBarCode(context.Context, *PrintBarCodeRequest) (*Response, error) + PrintBarCodePrint(context.Context, *PrintBarCodePrintRequest) (*Response, error) + PrintExpress(context.Context, *PrintExpressRequest) (*Response, error) + PrintExpressTransit(context.Context, *PrintExpressTransitRequest) (*Response, error) + PrintExpressPrint(context.Context, *PrintExpressPrintRequest) (*Response, error) + PrintProduct(context.Context, *EmtpyRequest) (*Response, error) + // 不需要登录 + PrintBind(context.Context, *PrintBindRequest) (*Response, error) // ****************API********************** ExpressSfBack(context.Context, *EmtpyRequest) (*SfResponse, error) ExpressJdBack(context.Context, *JdRequest) (*SfResponse, error) ExpressApiQuery(context.Context, *IdApiRequest) (*Response, error) ExpressApiEstimated(context.Context, *IdApiRequest) (*Response, error) ExpressApiCancel(context.Context, *IdApiRequest) (*Response, error) - ApiPrintBarCode(context.Context, *ApiPrintBarCodeRequest) (*Response, error) - ApiPrintBarCodePrint(context.Context, *ApiPrintBarCodePrintRequest) (*Response, error) - ApiPrintExpress(context.Context, *ApiPrintExpressRequest) (*Response, error) - ApiPrintExpressTransit(context.Context, *ApiPrintExpressTransitRequest) (*Response, error) - ApiPrintExpressPrint(context.Context, *ApiPrintExpressPrintRequest) (*Response, error) - ApiPrintProduct(context.Context, *EmtpyRequest) (*Response, error) - ApiLogin(context.Context, *ApiLoginRequest) (*Response, error) - // 不需要登录 - ApiPrintBind(context.Context, *ApiPrintBindRequest) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) GetDeliveryByOrderId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) @@ -444,9 +416,6 @@ func (UnimplementedExpressServer) Status(context.Context, *StatusRequest) (*Resp func (UnimplementedExpressServer) History(context.Context, *HistoryRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method History not implemented") } -func (UnimplementedExpressServer) ExpressCompany(context.Context, *ExpressCompanyRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ExpressCompany not implemented") -} func (UnimplementedExpressServer) ExpressDelivering(context.Context, *DeliveringRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressDelivering not implemented") } @@ -459,6 +428,27 @@ func (UnimplementedExpressServer) ExpressAdminQuery(context.Context, *IdRequest) func (UnimplementedExpressServer) ExpressAdminEstimated(context.Context, *IdRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressAdminEstimated not implemented") } +func (UnimplementedExpressServer) PrintBarCode(context.Context, *PrintBarCodeRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintBarCode not implemented") +} +func (UnimplementedExpressServer) PrintBarCodePrint(context.Context, *PrintBarCodePrintRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintBarCodePrint not implemented") +} +func (UnimplementedExpressServer) PrintExpress(context.Context, *PrintExpressRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintExpress not implemented") +} +func (UnimplementedExpressServer) PrintExpressTransit(context.Context, *PrintExpressTransitRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintExpressTransit not implemented") +} +func (UnimplementedExpressServer) PrintExpressPrint(context.Context, *PrintExpressPrintRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintExpressPrint not implemented") +} +func (UnimplementedExpressServer) PrintProduct(context.Context, *EmtpyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintProduct not implemented") +} +func (UnimplementedExpressServer) PrintBind(context.Context, *PrintBindRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method PrintBind not implemented") +} func (UnimplementedExpressServer) ExpressSfBack(context.Context, *EmtpyRequest) (*SfResponse, error) { return nil, status.Error(codes.Unimplemented, "method ExpressSfBack not implemented") } @@ -474,30 +464,6 @@ func (UnimplementedExpressServer) ExpressApiEstimated(context.Context, *IdApiReq func (UnimplementedExpressServer) ExpressApiCancel(context.Context, *IdApiRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method ExpressApiCancel not implemented") } -func (UnimplementedExpressServer) ApiPrintBarCode(context.Context, *ApiPrintBarCodeRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintBarCode not implemented") -} -func (UnimplementedExpressServer) ApiPrintBarCodePrint(context.Context, *ApiPrintBarCodePrintRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintBarCodePrint not implemented") -} -func (UnimplementedExpressServer) ApiPrintExpress(context.Context, *ApiPrintExpressRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintExpress not implemented") -} -func (UnimplementedExpressServer) ApiPrintExpressTransit(context.Context, *ApiPrintExpressTransitRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintExpressTransit not implemented") -} -func (UnimplementedExpressServer) ApiPrintExpressPrint(context.Context, *ApiPrintExpressPrintRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintExpressPrint not implemented") -} -func (UnimplementedExpressServer) ApiPrintProduct(context.Context, *EmtpyRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintProduct not implemented") -} -func (UnimplementedExpressServer) ApiLogin(context.Context, *ApiLoginRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiLogin not implemented") -} -func (UnimplementedExpressServer) ApiPrintBind(context.Context, *ApiPrintBindRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method ApiPrintBind not implemented") -} func (UnimplementedExpressServer) DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) { return nil, status.Error(codes.Unimplemented, "method DeliveryOrderCreate not implemented") } @@ -654,24 +620,6 @@ func _Express_History_Handler(srv interface{}, ctx context.Context, dec func(int return interceptor(ctx, in, info, handler) } -func _Express_ExpressCompany_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ExpressCompanyRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ExpressCompany(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ExpressCompany_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ExpressCompany(ctx, req.(*ExpressCompanyRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Express_ExpressDelivering_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeliveringRequest) if err := dec(in); err != nil { @@ -744,6 +692,132 @@ func _Express_ExpressAdminEstimated_Handler(srv interface{}, ctx context.Context return interceptor(ctx, in, info, handler) } +func _Express_PrintBarCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PrintBarCodeRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintBarCode(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintBarCode_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintBarCode(ctx, req.(*PrintBarCodeRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_PrintBarCodePrint_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PrintBarCodePrintRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintBarCodePrint(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintBarCodePrint_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintBarCodePrint(ctx, req.(*PrintBarCodePrintRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_PrintExpress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PrintExpressRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintExpress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintExpress_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintExpress(ctx, req.(*PrintExpressRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_PrintExpressTransit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PrintExpressTransitRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintExpressTransit(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintExpressTransit_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintExpressTransit(ctx, req.(*PrintExpressTransitRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_PrintExpressPrint_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PrintExpressPrintRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintExpressPrint(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintExpressPrint_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintExpressPrint(ctx, req.(*PrintExpressPrintRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_PrintProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmtpyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintProduct(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintProduct_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintProduct(ctx, req.(*EmtpyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_PrintBind_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PrintBindRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).PrintBind(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_PrintBind_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).PrintBind(ctx, req.(*PrintBindRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Express_ExpressSfBack_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(EmtpyRequest) if err := dec(in); err != nil { @@ -834,150 +908,6 @@ func _Express_ExpressApiCancel_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Express_ApiPrintBarCode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiPrintBarCodeRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintBarCode(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintBarCode_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintBarCode(ctx, req.(*ApiPrintBarCodeRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiPrintBarCodePrint_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiPrintBarCodePrintRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintBarCodePrint(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintBarCodePrint_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintBarCodePrint(ctx, req.(*ApiPrintBarCodePrintRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiPrintExpress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiPrintExpressRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintExpress(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintExpress_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintExpress(ctx, req.(*ApiPrintExpressRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiPrintExpressTransit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiPrintExpressTransitRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintExpressTransit(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintExpressTransit_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintExpressTransit(ctx, req.(*ApiPrintExpressTransitRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiPrintExpressPrint_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiPrintExpressPrintRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintExpressPrint(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintExpressPrint_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintExpressPrint(ctx, req.(*ApiPrintExpressPrintRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiPrintProduct_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(EmtpyRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintProduct(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintProduct_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintProduct(ctx, req.(*EmtpyRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiLogin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiLoginRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiLogin(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiLogin_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiLogin(ctx, req.(*ApiLoginRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Express_ApiPrintBind_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ApiPrintBindRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ExpressServer).ApiPrintBind(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Express_ApiPrintBind_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ExpressServer).ApiPrintBind(ctx, req.(*ApiPrintBindRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Express_DeliveryOrderCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(DeliveryOrderCreateRequest) if err := dec(in); err != nil { @@ -1067,10 +997,6 @@ var Express_ServiceDesc = grpc.ServiceDesc{ MethodName: "History", Handler: _Express_History_Handler, }, - { - MethodName: "ExpressCompany", - Handler: _Express_ExpressCompany_Handler, - }, { MethodName: "ExpressDelivering", Handler: _Express_ExpressDelivering_Handler, @@ -1087,6 +1013,34 @@ var Express_ServiceDesc = grpc.ServiceDesc{ MethodName: "ExpressAdminEstimated", Handler: _Express_ExpressAdminEstimated_Handler, }, + { + MethodName: "PrintBarCode", + Handler: _Express_PrintBarCode_Handler, + }, + { + MethodName: "PrintBarCodePrint", + Handler: _Express_PrintBarCodePrint_Handler, + }, + { + MethodName: "PrintExpress", + Handler: _Express_PrintExpress_Handler, + }, + { + MethodName: "PrintExpressTransit", + Handler: _Express_PrintExpressTransit_Handler, + }, + { + MethodName: "PrintExpressPrint", + Handler: _Express_PrintExpressPrint_Handler, + }, + { + MethodName: "PrintProduct", + Handler: _Express_PrintProduct_Handler, + }, + { + MethodName: "PrintBind", + Handler: _Express_PrintBind_Handler, + }, { MethodName: "ExpressSfBack", Handler: _Express_ExpressSfBack_Handler, @@ -1107,38 +1061,6 @@ var Express_ServiceDesc = grpc.ServiceDesc{ MethodName: "ExpressApiCancel", Handler: _Express_ExpressApiCancel_Handler, }, - { - MethodName: "ApiPrintBarCode", - Handler: _Express_ApiPrintBarCode_Handler, - }, - { - MethodName: "ApiPrintBarCodePrint", - Handler: _Express_ApiPrintBarCodePrint_Handler, - }, - { - MethodName: "ApiPrintExpress", - Handler: _Express_ApiPrintExpress_Handler, - }, - { - MethodName: "ApiPrintExpressTransit", - Handler: _Express_ApiPrintExpressTransit_Handler, - }, - { - MethodName: "ApiPrintExpressPrint", - Handler: _Express_ApiPrintExpressPrint_Handler, - }, - { - MethodName: "ApiPrintProduct", - Handler: _Express_ApiPrintProduct_Handler, - }, - { - MethodName: "ApiLogin", - Handler: _Express_ApiLogin_Handler, - }, - { - MethodName: "ApiPrintBind", - Handler: _Express_ApiPrintBind_Handler, - }, { MethodName: "DeliveryOrderCreate", Handler: _Express_DeliveryOrderCreate_Handler, diff --git a/services/equipment/internal/logic/bindExpiryLogic.go b/services/equipment/internal/logic/bindExpiryLogic.go index 2d0dca8..bddd4b9 100644 --- a/services/equipment/internal/logic/bindExpiryLogic.go +++ b/services/equipment/internal/logic/bindExpiryLogic.go @@ -55,17 +55,27 @@ func (l *BindExpiryLogic) BindExpiry(in *equipment.BindExpiryRequest) (*equipmen if info.Id < utils.NumberOne { return l.fail(utils.SetError(utils.Fail, "没有找到数据")) } - + action := utils.ActionAdd{ + OldContent: info, + Reason: in.Reason, + Type: utils.LogActionTypeEdit, + } info.ExpiryTime = in.Expiry info.AdminId = in.Id info.AdminName = adminInfo.Name info.Reason = in.Reason - _, err = model.BindModel{}.Init().Edit(w, &info) + row, err := model.BindModel{}.Init().Edit(w, &info) if err != nil { l.Logger.Error(err) return l.fail(utils.Fail) } + if row > utils.NumberZero { + action.NewContent = info + action.ModuleName = utils.LogActionModuleEquipment + utils.SetActionLog(adminInfo, action) + } + return l.ok(utils.NumberOne) } diff --git a/services/express/expressclient/express.go b/services/express/expressclient/express.go index e27d8dc..e1a9986 100644 --- a/services/express/expressclient/express.go +++ b/services/express/expressclient/express.go @@ -14,28 +14,27 @@ import ( ) type ( - ApiLoginRequest = express.ApiLoginRequest - ApiPrintBarCodePrintRequest = express.ApiPrintBarCodePrintRequest - ApiPrintBarCodeRequest = express.ApiPrintBarCodeRequest - ApiPrintBindRequest = express.ApiPrintBindRequest - ApiPrintExpressPrintRequest = express.ApiPrintExpressPrintRequest - ApiPrintExpressRequest = express.ApiPrintExpressRequest - ApiPrintExpressTransitRequest = express.ApiPrintExpressTransitRequest - CreateRequest = express.CreateRequest - DeliverOrderProductInfo = express.DeliverOrderProductInfo - DeliveringRequest = express.DeliveringRequest - DeliveryInfoResponse = express.DeliveryInfoResponse - DeliveryOrderCreateRequest = express.DeliveryOrderCreateRequest - EmtpyRequest = express.EmtpyRequest - ExpressCompanyRequest = express.ExpressCompanyRequest - HistoryRequest = express.HistoryRequest - IdApiRequest = express.IdApiRequest - IdRequest = express.IdRequest - IdResponse = express.IdResponse - JdRequest = express.JdRequest - Response = express.Response - SfResponse = express.SfResponse - StatusRequest = express.StatusRequest + CreateRequest = express.CreateRequest + DeliverOrderProductInfo = express.DeliverOrderProductInfo + DeliveringRequest = express.DeliveringRequest + DeliveryInfoResponse = express.DeliveryInfoResponse + DeliveryOrderCreateRequest = express.DeliveryOrderCreateRequest + EmtpyRequest = express.EmtpyRequest + ExpressPrintCompanyRequest = express.ExpressPrintCompanyRequest + HistoryRequest = express.HistoryRequest + IdApiRequest = express.IdApiRequest + IdRequest = express.IdRequest + IdResponse = express.IdResponse + JdRequest = express.JdRequest + PrintBarCodePrintRequest = express.PrintBarCodePrintRequest + PrintBarCodeRequest = express.PrintBarCodeRequest + PrintBindRequest = express.PrintBindRequest + PrintExpressPrintRequest = express.PrintExpressPrintRequest + PrintExpressRequest = express.PrintExpressRequest + PrintExpressTransitRequest = express.PrintExpressTransitRequest + Response = express.Response + SfResponse = express.SfResponse + StatusRequest = express.StatusRequest Express interface { Items(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) @@ -45,28 +44,25 @@ type ( Names(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) History(ctx context.Context, in *HistoryRequest, opts ...grpc.CallOption) (*Response, error) - // 获取可选的打印公司 - ExpressCompany(ctx context.Context, in *ExpressCompanyRequest, opts ...grpc.CallOption) (*Response, error) // 发货 ExpressDelivering(ctx context.Context, in *DeliveringRequest, opts ...grpc.CallOption) (*Response, error) ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressAdminQuery(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) ExpressAdminEstimated(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + PrintBarCode(ctx context.Context, in *PrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) + PrintBarCodePrint(ctx context.Context, in *PrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) + PrintExpress(ctx context.Context, in *PrintExpressRequest, opts ...grpc.CallOption) (*Response, error) + PrintExpressTransit(ctx context.Context, in *PrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) + PrintExpressPrint(ctx context.Context, in *PrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) + PrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) + // 不需要登录 + PrintBind(ctx context.Context, in *PrintBindRequest, opts ...grpc.CallOption) (*Response, error) // API ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressJdBack(ctx context.Context, in *JdRequest, opts ...grpc.CallOption) (*SfResponse, error) ExpressApiQuery(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiEstimated(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) ExpressApiCancel(ctx context.Context, in *IdApiRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) - ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) - ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) - // 不需要登录 - ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, 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) @@ -119,12 +115,6 @@ func (m *defaultExpress) History(ctx context.Context, in *HistoryRequest, opts . return client.History(ctx, in, opts...) } -// 获取可选的打印公司 -func (m *defaultExpress) ExpressCompany(ctx context.Context, in *ExpressCompanyRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ExpressCompany(ctx, in, opts...) -} - // 发货 func (m *defaultExpress) ExpressDelivering(ctx context.Context, in *DeliveringRequest, opts ...grpc.CallOption) (*Response, error) { client := express.NewExpressClient(m.cli.Conn()) @@ -146,6 +136,42 @@ func (m *defaultExpress) ExpressAdminEstimated(ctx context.Context, in *IdReques return client.ExpressAdminEstimated(ctx, in, opts...) } +func (m *defaultExpress) PrintBarCode(ctx context.Context, in *PrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintBarCode(ctx, in, opts...) +} + +func (m *defaultExpress) PrintBarCodePrint(ctx context.Context, in *PrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintBarCodePrint(ctx, in, opts...) +} + +func (m *defaultExpress) PrintExpress(ctx context.Context, in *PrintExpressRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintExpress(ctx, in, opts...) +} + +func (m *defaultExpress) PrintExpressTransit(ctx context.Context, in *PrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintExpressTransit(ctx, in, opts...) +} + +func (m *defaultExpress) PrintExpressPrint(ctx context.Context, in *PrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintExpressPrint(ctx, in, opts...) +} + +func (m *defaultExpress) PrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintProduct(ctx, in, opts...) +} + +// 不需要登录 +func (m *defaultExpress) PrintBind(ctx context.Context, in *PrintBindRequest, opts ...grpc.CallOption) (*Response, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.PrintBind(ctx, in, opts...) +} + // API func (m *defaultExpress) ExpressSfBack(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*SfResponse, error) { client := express.NewExpressClient(m.cli.Conn()) @@ -172,47 +198,6 @@ func (m *defaultExpress) ExpressApiCancel(ctx context.Context, in *IdApiRequest, return client.ExpressApiCancel(ctx, in, opts...) } -func (m *defaultExpress) ApiPrintBarCode(ctx context.Context, in *ApiPrintBarCodeRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintBarCode(ctx, in, opts...) -} - -func (m *defaultExpress) ApiPrintBarCodePrint(ctx context.Context, in *ApiPrintBarCodePrintRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintBarCodePrint(ctx, in, opts...) -} - -func (m *defaultExpress) ApiPrintExpress(ctx context.Context, in *ApiPrintExpressRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintExpress(ctx, in, opts...) -} - -func (m *defaultExpress) ApiPrintExpressTransit(ctx context.Context, in *ApiPrintExpressTransitRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintExpressTransit(ctx, in, opts...) -} - -func (m *defaultExpress) ApiPrintExpressPrint(ctx context.Context, in *ApiPrintExpressPrintRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintExpressPrint(ctx, in, opts...) -} - -func (m *defaultExpress) ApiPrintProduct(ctx context.Context, in *EmtpyRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintProduct(ctx, in, opts...) -} - -func (m *defaultExpress) ApiLogin(ctx context.Context, in *ApiLoginRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiLogin(ctx, in, opts...) -} - -// 不需要登录 -func (m *defaultExpress) ApiPrintBind(ctx context.Context, in *ApiPrintBindRequest, opts ...grpc.CallOption) (*Response, error) { - client := express.NewExpressClient(m.cli.Conn()) - return client.ApiPrintBind(ctx, in, opts...) -} - // 添加生成订单的发货信息 func (m *defaultExpress) DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error) { client := express.NewExpressClient(m.cli.Conn()) diff --git a/services/express/internal/logic/apiLoginLogic.go b/services/express/internal/logic/apiLoginLogic.go deleted file mode 100644 index 3c61feb..0000000 --- a/services/express/internal/logic/apiLoginLogic.go +++ /dev/null @@ -1,40 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/services/express/validator" - - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiLoginLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiLoginLogic { - return &ApiLoginLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *ApiLoginLogic) ApiLogin(in *express.ApiLoginRequest) (*express.Response, error) { - var v validator.PrintLoginValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/apiPrintBarCodeLogic.go b/services/express/internal/logic/apiPrintBarCodeLogic.go deleted file mode 100644 index ff1f135..0000000 --- a/services/express/internal/logic/apiPrintBarCodeLogic.go +++ /dev/null @@ -1,40 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/services/express/validator" - - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiPrintBarCodeLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiPrintBarCodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintBarCodeLogic { - return &ApiPrintBarCodeLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *ApiPrintBarCodeLogic) ApiPrintBarCode(in *express.ApiPrintBarCodeRequest) (*express.Response, error) { - var v validator.PrintBarCodeValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/apiPrintBarCodePrintLogic.go b/services/express/internal/logic/apiPrintBarCodePrintLogic.go deleted file mode 100644 index c40318e..0000000 --- a/services/express/internal/logic/apiPrintBarCodePrintLogic.go +++ /dev/null @@ -1,40 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/services/express/validator" - - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiPrintBarCodePrintLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiPrintBarCodePrintLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintBarCodePrintLogic { - return &ApiPrintBarCodePrintLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *ApiPrintBarCodePrintLogic) ApiPrintBarCodePrint(in *express.ApiPrintBarCodePrintRequest) (*express.Response, error) { - var v validator.PrintBarCodeUseValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/apiPrintBindLogic.go b/services/express/internal/logic/apiPrintBindLogic.go deleted file mode 100644 index 43c6e8e..0000000 --- a/services/express/internal/logic/apiPrintBindLogic.go +++ /dev/null @@ -1,41 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/services/express/validator" - - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiPrintBindLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiPrintBindLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintBindLogic { - return &ApiPrintBindLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -// 不需要登录 -func (l *ApiPrintBindLogic) ApiPrintBind(in *express.ApiPrintBindRequest) (*express.Response, error) { - var v validator.PrintETransitBindValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/apiPrintExpressLogic.go b/services/express/internal/logic/apiPrintExpressLogic.go deleted file mode 100644 index 51923c1..0000000 --- a/services/express/internal/logic/apiPrintExpressLogic.go +++ /dev/null @@ -1,40 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/services/express/validator" - - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiPrintExpressLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiPrintExpressLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintExpressLogic { - return &ApiPrintExpressLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *ApiPrintExpressLogic) ApiPrintExpress(in *express.ApiPrintExpressRequest) (*express.Response, error) { - var v validator.PrintOrderValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/apiPrintExpressPrintLogic.go b/services/express/internal/logic/apiPrintExpressPrintLogic.go deleted file mode 100644 index 36b8a32..0000000 --- a/services/express/internal/logic/apiPrintExpressPrintLogic.go +++ /dev/null @@ -1,39 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - "lone-services/services/express/validator" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiPrintExpressPrintLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiPrintExpressPrintLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintExpressPrintLogic { - return &ApiPrintExpressPrintLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *ApiPrintExpressPrintLogic) ApiPrintExpressPrint(in *express.ApiPrintExpressPrintRequest) (*express.Response, error) { - var v validator.PrintOrderUseValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/apiPrintProductLogic.go b/services/express/internal/logic/apiPrintProductLogic.go deleted file mode 100644 index 8b8eaef..0000000 --- a/services/express/internal/logic/apiPrintProductLogic.go +++ /dev/null @@ -1,34 +0,0 @@ -package logic - -import ( - "context" - "lone-services/pkg/utils" - "lone-services/rpc/express/pb" - "lone-services/services/express/internal/svc" - - "github.com/zeromicro/go-zero/core/logx" -) - -type ApiPrintProductLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewApiPrintProductLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintProductLogic { - return &ApiPrintProductLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *ApiPrintProductLogic) ApiPrintProduct(in *express.EmtpyRequest) (*express.Response, error) { - adminInfo := utils.GetUserFromCtx(l.ctx) - if adminInfo.ID < utils.NumberOne { - return l.fail(utils.ErrorNoLoginInfo) - } - - return l.ok(nil) -} diff --git a/services/express/internal/logic/printBarCodeLogic.go b/services/express/internal/logic/printBarCodeLogic.go new file mode 100644 index 0000000..0c65979 --- /dev/null +++ b/services/express/internal/logic/printBarCodeLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type PrintBarCodeLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewPrintBarCodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintBarCodeLogic { + return &PrintBarCodeLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *PrintBarCodeLogic) PrintBarCode(in *express.PrintBarCodeRequest) (*express.Response, error) { + // todo: add your logic here and delete this line + + return &express.Response{}, nil +} diff --git a/services/express/internal/logic/printBarCodePrintLogic.go b/services/express/internal/logic/printBarCodePrintLogic.go new file mode 100644 index 0000000..f15befd --- /dev/null +++ b/services/express/internal/logic/printBarCodePrintLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type PrintBarCodePrintLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewPrintBarCodePrintLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintBarCodePrintLogic { + return &PrintBarCodePrintLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *PrintBarCodePrintLogic) PrintBarCodePrint(in *express.PrintBarCodePrintRequest) (*express.Response, error) { + // todo: add your logic here and delete this line + + return &express.Response{}, nil +} diff --git a/services/express/internal/logic/printBindLogic.go b/services/express/internal/logic/printBindLogic.go new file mode 100644 index 0000000..85279ba --- /dev/null +++ b/services/express/internal/logic/printBindLogic.go @@ -0,0 +1,31 @@ +package logic + +import ( + "context" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type PrintBindLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewPrintBindLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintBindLogic { + return &PrintBindLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +// 不需要登录 +func (l *PrintBindLogic) PrintBind(in *express.PrintBindRequest) (*express.Response, error) { + // todo: add your logic here and delete this line + + return &express.Response{}, nil +} diff --git a/services/express/internal/logic/printExpressLogic.go b/services/express/internal/logic/printExpressLogic.go new file mode 100644 index 0000000..c8d9af9 --- /dev/null +++ b/services/express/internal/logic/printExpressLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type PrintExpressLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewPrintExpressLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintExpressLogic { + return &PrintExpressLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *PrintExpressLogic) PrintExpress(in *express.PrintExpressRequest) (*express.Response, error) { + // todo: add your logic here and delete this line + + return &express.Response{}, nil +} diff --git a/services/express/internal/logic/printExpressPrintLogic.go b/services/express/internal/logic/printExpressPrintLogic.go new file mode 100644 index 0000000..1a9cbb2 --- /dev/null +++ b/services/express/internal/logic/printExpressPrintLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type PrintExpressPrintLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewPrintExpressPrintLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintExpressPrintLogic { + return &PrintExpressPrintLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *PrintExpressPrintLogic) PrintExpressPrint(in *express.PrintExpressPrintRequest) (*express.Response, error) { + // todo: add your logic here and delete this line + + return &express.Response{}, nil +} diff --git a/services/express/internal/logic/apiPrintExpressTransitLogic.go b/services/express/internal/logic/printExpressTransitLogic.go similarity index 75% rename from services/express/internal/logic/apiPrintExpressTransitLogic.go rename to services/express/internal/logic/printExpressTransitLogic.go index 7ac6953..0033145 100644 --- a/services/express/internal/logic/apiPrintExpressTransitLogic.go +++ b/services/express/internal/logic/printExpressTransitLogic.go @@ -3,29 +3,30 @@ package logic import ( "context" "lone-services/pkg/utils" + "lone-services/services/express/validator" + "lone-services/rpc/express/pb" "lone-services/services/express/internal/svc" - "lone-services/services/express/validator" "github.com/zeromicro/go-zero/core/logx" ) -type ApiPrintExpressTransitLogic struct { +type PrintExpressTransitLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger BaseLogic } -func NewApiPrintExpressTransitLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiPrintExpressTransitLogic { - return &ApiPrintExpressTransitLogic{ +func NewPrintExpressTransitLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintExpressTransitLogic { + return &PrintExpressTransitLogic{ ctx: ctx, svcCtx: svcCtx, Logger: logx.WithContext(ctx), } } -func (l *ApiPrintExpressTransitLogic) ApiPrintExpressTransit(in *express.ApiPrintExpressTransitRequest) (*express.Response, error) { +func (l *PrintExpressTransitLogic) PrintExpressTransit(in *express.PrintExpressTransitRequest) (*express.Response, error) { var v validator.PrintExpressTransitValidator if fail := l.checkParams(in, &v); fail != nil { return fail, nil diff --git a/services/express/internal/logic/printProductLogic.go b/services/express/internal/logic/printProductLogic.go new file mode 100644 index 0000000..f2207d9 --- /dev/null +++ b/services/express/internal/logic/printProductLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type PrintProductLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewPrintProductLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PrintProductLogic { + return &PrintProductLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *PrintProductLogic) PrintProduct(in *express.EmtpyRequest) (*express.Response, error) { + // todo: add your logic here and delete this line + + return &express.Response{}, nil +} diff --git a/services/express/internal/server/expressServer.go b/services/express/internal/server/expressServer.go index 403d9d4..96d6b90 100644 --- a/services/express/internal/server/expressServer.go +++ b/services/express/internal/server/expressServer.go @@ -58,12 +58,6 @@ func (s *ExpressServer) History(ctx context.Context, in *express.HistoryRequest) return l.History(in) } -// 获取可选的打印公司 -func (s *ExpressServer) ExpressCompany(ctx context.Context, in *express.ExpressCompanyRequest) (*express.Response, error) { - l := logic.NewExpressCompanyLogic(ctx, s.svcCtx) - return l.ExpressCompany(in) -} - // 发货 func (s *ExpressServer) ExpressDelivering(ctx context.Context, in *express.DeliveringRequest) (*express.Response, error) { l := logic.NewExpressDeliveringLogic(ctx, s.svcCtx) @@ -85,6 +79,42 @@ func (s *ExpressServer) ExpressAdminEstimated(ctx context.Context, in *express.I return l.ExpressAdminEstimated(in) } +func (s *ExpressServer) PrintBarCode(ctx context.Context, in *express.PrintBarCodeRequest) (*express.Response, error) { + l := logic.NewPrintBarCodeLogic(ctx, s.svcCtx) + return l.PrintBarCode(in) +} + +func (s *ExpressServer) PrintBarCodePrint(ctx context.Context, in *express.PrintBarCodePrintRequest) (*express.Response, error) { + l := logic.NewPrintBarCodePrintLogic(ctx, s.svcCtx) + return l.PrintBarCodePrint(in) +} + +func (s *ExpressServer) PrintExpress(ctx context.Context, in *express.PrintExpressRequest) (*express.Response, error) { + l := logic.NewPrintExpressLogic(ctx, s.svcCtx) + return l.PrintExpress(in) +} + +func (s *ExpressServer) PrintExpressTransit(ctx context.Context, in *express.PrintExpressTransitRequest) (*express.Response, error) { + l := logic.NewPrintExpressTransitLogic(ctx, s.svcCtx) + return l.PrintExpressTransit(in) +} + +func (s *ExpressServer) PrintExpressPrint(ctx context.Context, in *express.PrintExpressPrintRequest) (*express.Response, error) { + l := logic.NewPrintExpressPrintLogic(ctx, s.svcCtx) + return l.PrintExpressPrint(in) +} + +func (s *ExpressServer) PrintProduct(ctx context.Context, in *express.EmtpyRequest) (*express.Response, error) { + l := logic.NewPrintProductLogic(ctx, s.svcCtx) + return l.PrintProduct(in) +} + +// 不需要登录 +func (s *ExpressServer) PrintBind(ctx context.Context, in *express.PrintBindRequest) (*express.Response, error) { + l := logic.NewPrintBindLogic(ctx, s.svcCtx) + return l.PrintBind(in) +} + // API func (s *ExpressServer) ExpressSfBack(ctx context.Context, in *express.EmtpyRequest) (*express.SfResponse, error) { l := logic.NewExpressSfBackLogic(ctx, s.svcCtx) @@ -111,47 +141,6 @@ func (s *ExpressServer) ExpressApiCancel(ctx context.Context, in *express.IdApiR return l.ExpressApiCancel(in) } -func (s *ExpressServer) ApiPrintBarCode(ctx context.Context, in *express.ApiPrintBarCodeRequest) (*express.Response, error) { - l := logic.NewApiPrintBarCodeLogic(ctx, s.svcCtx) - return l.ApiPrintBarCode(in) -} - -func (s *ExpressServer) ApiPrintBarCodePrint(ctx context.Context, in *express.ApiPrintBarCodePrintRequest) (*express.Response, error) { - l := logic.NewApiPrintBarCodePrintLogic(ctx, s.svcCtx) - return l.ApiPrintBarCodePrint(in) -} - -func (s *ExpressServer) ApiPrintExpress(ctx context.Context, in *express.ApiPrintExpressRequest) (*express.Response, error) { - l := logic.NewApiPrintExpressLogic(ctx, s.svcCtx) - return l.ApiPrintExpress(in) -} - -func (s *ExpressServer) ApiPrintExpressTransit(ctx context.Context, in *express.ApiPrintExpressTransitRequest) (*express.Response, error) { - l := logic.NewApiPrintExpressTransitLogic(ctx, s.svcCtx) - return l.ApiPrintExpressTransit(in) -} - -func (s *ExpressServer) ApiPrintExpressPrint(ctx context.Context, in *express.ApiPrintExpressPrintRequest) (*express.Response, error) { - l := logic.NewApiPrintExpressPrintLogic(ctx, s.svcCtx) - return l.ApiPrintExpressPrint(in) -} - -func (s *ExpressServer) ApiPrintProduct(ctx context.Context, in *express.EmtpyRequest) (*express.Response, error) { - l := logic.NewApiPrintProductLogic(ctx, s.svcCtx) - return l.ApiPrintProduct(in) -} - -func (s *ExpressServer) ApiLogin(ctx context.Context, in *express.ApiLoginRequest) (*express.Response, error) { - l := logic.NewApiLoginLogic(ctx, s.svcCtx) - return l.ApiLogin(in) -} - -// 不需要登录 -func (s *ExpressServer) ApiPrintBind(ctx context.Context, in *express.ApiPrintBindRequest) (*express.Response, error) { - l := logic.NewApiPrintBindLogic(ctx, s.svcCtx) - return l.ApiPrintBind(in) -} - // 添加生成订单的发货信息 func (s *ExpressServer) DeliveryOrderCreate(ctx context.Context, in *express.DeliveryOrderCreateRequest) (*express.IdResponse, error) { l := logic.NewDeliveryOrderCreateLogic(ctx, s.svcCtx) diff --git a/services/percutaneous/internal/logic/addUserLogic.go b/services/percutaneous/internal/logic/addUserLogic.go index a92365d..2559d9b 100644 --- a/services/percutaneous/internal/logic/addUserLogic.go +++ b/services/percutaneous/internal/logic/addUserLogic.go @@ -62,7 +62,6 @@ func (l *AddUserLogic) AddUser(in *percutaneous.AddUserRequest) (*percutaneous.R } } - // 取出等待中的ws会话 sess := l.svcCtx.SessionMgr.Pop(in.HostCode) if sess == nil { l.Logger.Error("no waiting ws session code is = ", in.HostCode) diff --git a/services/percutaneous/internal/logic/wsAddUserStreamLogic.go b/services/percutaneous/internal/logic/wsAddUserStreamLogic.go index ed27e94..82336ee 100644 --- a/services/percutaneous/internal/logic/wsAddUserStreamLogic.go +++ b/services/percutaneous/internal/logic/wsAddUserStreamLogic.go @@ -46,7 +46,6 @@ func NewWsAddUserStreamLogic(ctx context.Context, svcCtx *svc.ServiceContext) *W } } -// 添加用户 func (l *WsAddUserStreamLogic) WsAddUserStream(stream percutaneous.Percutaneous_WsAddUserStreamServer) error { ctx := stream.Context() timeout := time.Duration(utils.GetConfigInt("ws.out_time")) * time.Second @@ -55,7 +54,6 @@ func (l *WsAddUserStreamLogic) WsAddUserStream(stream percutaneous.Percutaneous_ cancel() }() - // BFF自动发来第一条消息，读取host_code recvFrame, err := stream.Recv() if err != nil { l.Logger.Errorf("recv host_code failed: %v", err) @@ -64,7 +62,6 @@ func (l *WsAddUserStreamLogic) WsAddUserStream(stream percutaneous.Percutaneous_ var hostCode struct { Code string `json:"host_code"` } - // 保留你确认的 !err 判断 if ok := utils.JsonStringToStruct(string(recvFrame.RawBody), &hostCode); !ok { return status.Errorf(codes.InvalidArgument, "device code parse error") } @@ -102,7 +99,6 @@ func (l *WsAddUserStreamLogic) getUserInfo(id int64) *userInfo { if id == utils.NumberZero { return nil } - logx.Errorf("get user id: %v", id) cli, err := svc.GetRpcClient(l.svcCtx.UserName) if err != nil { logx.Errorf("get user err: %v", err)