From 369bbd43fdb0dd595f83d183a3a064f2924df51d Mon Sep 17 00:00:00 2001 From: gjs Date: Mon, 21 Sep 2026 15:03:52 +0800 Subject: [PATCH] supply --- pkg/utils/status.go | 6 +- rpc/express/express.pb | Bin 16673 -> 17031 bytes rpc/express/express.proto | 10 + rpc/express/pb/express.pb.go | 147 ++- rpc/express/pb/express_grpc.pb.go | 76 ++ rpc/order/order.pb | Bin 18800 -> 19527 bytes rpc/order/order.proto | 153 ++- rpc/order/pb/order.pb.go | 556 +++++++--- rpc/order/pb/order_grpc.pb.go | 998 ++++++++++-------- services/equipment/internal/dao/bind.go | 2 +- services/express/expressclient/express.go | 13 + .../express/internal/dao/deliveryOrder.go | 2 + .../logic/getDeliveryByOrderIdLogic.go | 55 + .../logic/getDeliveryBySupplyIdLogic.go | 55 + .../express/internal/server/expressServer.go | 10 + services/order/internal/dao/order.go | 11 + services/order/internal/dao/orderProduct.go | 4 + services/order/internal/dao/supply.go | 110 ++ .../internal/logic/apiSupplyInfoLogic.go | 129 +++ .../order/internal/logic/apiSupplyLogic.go | 130 +++ .../internal/logic/orderAuditingLogic.go | 2 +- .../order/internal/logic/orderCreateLogic.go | 2 + .../order/internal/logic/supplyItemsLogic.go | 145 +++ .../order/internal/logic/supplyStatusLogic.go | 217 ++++ .../order/internal/logic/webCreateLogic.go | 2 + .../order/internal/logic/webCreateOneLogic.go | 3 + services/order/internal/model/supply.go | 23 + services/order/internal/server/orderServer.go | 135 ++- services/order/internal/svc/order.go | 36 + services/order/orderClient/order.go | 170 +-- services/order/validator/supply.go | 47 + 31 files changed, 2480 insertions(+), 769 deletions(-) create mode 100644 services/express/internal/logic/getDeliveryByOrderIdLogic.go create mode 100644 services/express/internal/logic/getDeliveryBySupplyIdLogic.go create mode 100644 services/order/internal/dao/supply.go create mode 100644 services/order/internal/logic/apiSupplyInfoLogic.go create mode 100644 services/order/internal/logic/apiSupplyLogic.go create mode 100644 services/order/internal/logic/supplyItemsLogic.go create mode 100644 services/order/internal/logic/supplyStatusLogic.go create mode 100644 services/order/internal/model/supply.go create mode 100644 services/order/validator/supply.go diff --git a/pkg/utils/status.go b/pkg/utils/status.go index b61eacc..312b830 100644 --- a/pkg/utils/status.go +++ b/pkg/utils/status.go @@ -131,9 +131,11 @@ var ( ErrorMobileError = Status{Code: 10013, Msg: "手机号格式错误"} // ErrorNotFund 数据类 - ErrorFormatDataError = Status{Code: 11014, Msg: "格式化数据出错"} - ErrorStockNotEnough = Status{Code: 11015, Msg: "库存不足"} + ErrorFormatDataError = Status{Code: 11014, Msg: "格式化数据出错"} + ErrorStockNotEnough = Status{Code: 11015, Msg: "库存不足"} + ErrorSupplyOrderError = Status{Code: 11016, Msg: "已经补过货"} + ErrorSupplyOrderProduct = Status{Code: 31013, Msg: "产品信息错误"} // —————————————————————————————————————————————————————————————————————————————————————— // 基础类 diff --git a/rpc/express/express.pb b/rpc/express/express.pb index 881281d482bd2a63727d98b5e8f94e87190e0b65..e51ddf00244d5d269a6de83f6eaa6f5bac080b01 100644 GIT binary patch delta 375 zcmZ43#Ms`-xZ$xe(<0f;PmNpH>Xptga*4R4=46(o7FBxYrR4{u78m5_6{iX*a`BWD zCFT`pmc-{J=B7$8Dllqr2602h{D4A2vRqs+CB=CXOkf3^P?6v~AyqEE)Z&uN+{BX9 zlz1SWD!~j^!V4D-2?mM^DRc3{j43PyIzxg5tPEy-AV^F|jEk+fB(bElSb`NO%Nhjb z3Gs0;Wu{250mYbufGnf!e4BHu7O+VOd2)%kr express.DeliverOrderProductInfo @@ -1110,26 +1205,30 @@ var file_express_express_proto_depIdxs = []int32{ 13, // 16: express.Express.ExpressApiCancel:input_type -> express.IdApiRequest 6, // 17: express.Express.ExpressAdminCancel:input_type -> express.IdRequest 9, // 18: express.Express.DeliveryOrderCreate:input_type -> express.DeliveryOrderCreateRequest - 0, // 19: express.Express.Items:output_type -> express.Response - 0, // 20: express.Express.Create:output_type -> express.Response - 0, // 21: express.Express.Edit:output_type -> express.Response - 0, // 22: express.Express.Info:output_type -> express.Response - 0, // 23: express.Express.Names:output_type -> express.Response - 0, // 24: express.Express.Status:output_type -> express.Response - 0, // 25: express.Express.History:output_type -> express.Response - 0, // 26: express.Express.ExpressCompany:output_type -> express.Response - 0, // 27: express.Express.ExpressDelivering:output_type -> express.Response - 1, // 28: express.Express.ExpressSfBack:output_type -> express.SfResponse - 1, // 29: express.Express.ExpressJdBack:output_type -> express.SfResponse - 0, // 30: express.Express.ExpressApiQuery:output_type -> express.Response - 0, // 31: express.Express.ExpressAdminQuery:output_type -> express.Response - 0, // 32: express.Express.ExpressApiEstimated:output_type -> express.Response - 0, // 33: express.Express.ExpressAdminEstimated:output_type -> express.Response - 0, // 34: express.Express.ExpressApiCancel:output_type -> express.Response - 0, // 35: express.Express.ExpressAdminCancel:output_type -> express.Response - 2, // 36: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse - 19, // [19:37] is the sub-list for method output_type - 1, // [1:19] is the sub-list for method input_type + 6, // 19: express.Express.GetDeliveryByOrderId:input_type -> express.IdRequest + 6, // 20: express.Express.GetDeliveryBySupplyId:input_type -> express.IdRequest + 0, // 21: express.Express.Items:output_type -> express.Response + 0, // 22: express.Express.Create:output_type -> express.Response + 0, // 23: express.Express.Edit:output_type -> express.Response + 0, // 24: express.Express.Info:output_type -> express.Response + 0, // 25: express.Express.Names:output_type -> express.Response + 0, // 26: express.Express.Status:output_type -> express.Response + 0, // 27: express.Express.History:output_type -> express.Response + 0, // 28: express.Express.ExpressCompany:output_type -> express.Response + 0, // 29: express.Express.ExpressDelivering:output_type -> express.Response + 1, // 30: express.Express.ExpressSfBack:output_type -> express.SfResponse + 1, // 31: express.Express.ExpressJdBack:output_type -> express.SfResponse + 0, // 32: express.Express.ExpressApiQuery:output_type -> express.Response + 0, // 33: express.Express.ExpressAdminQuery:output_type -> express.Response + 0, // 34: express.Express.ExpressApiEstimated:output_type -> express.Response + 0, // 35: express.Express.ExpressAdminEstimated:output_type -> express.Response + 0, // 36: express.Express.ExpressApiCancel:output_type -> express.Response + 0, // 37: express.Express.ExpressAdminCancel:output_type -> express.Response + 2, // 38: express.Express.DeliveryOrderCreate:output_type -> express.IdResponse + 14, // 39: express.Express.GetDeliveryByOrderId:output_type -> express.DeliveryInfoResponse + 14, // 40: express.Express.GetDeliveryBySupplyId:output_type -> express.DeliveryInfoResponse + 21, // [21:41] is the sub-list for method output_type + 1, // [1:21] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name 1, // [1:1] is the sub-list for extension extendee 0, // [0:1] is the sub-list for field type_name @@ -1146,7 +1245,7 @@ func file_express_express_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_express_express_proto_rawDesc), len(file_express_express_proto_rawDesc)), NumEnums: 0, - NumMessages: 14, + NumMessages: 15, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/express/pb/express_grpc.pb.go b/rpc/express/pb/express_grpc.pb.go index 5816015..80f3c88 100644 --- a/rpc/express/pb/express_grpc.pb.go +++ b/rpc/express/pb/express_grpc.pb.go @@ -37,6 +37,8 @@ const ( Express_ExpressApiCancel_FullMethodName = "/express.Express/ExpressApiCancel" Express_ExpressAdminCancel_FullMethodName = "/express.Express/ExpressAdminCancel" Express_DeliveryOrderCreate_FullMethodName = "/express.Express/DeliveryOrderCreate" + Express_GetDeliveryByOrderId_FullMethodName = "/express.Express/GetDeliveryByOrderId" + Express_GetDeliveryBySupplyId_FullMethodName = "/express.Express/GetDeliveryBySupplyId" ) // ExpressClient is the client API for Express service. @@ -64,6 +66,8 @@ type ExpressClient interface { ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error) + GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) + GetDeliveryBySupplyId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) } type expressClient struct { @@ -254,6 +258,26 @@ func (c *expressClient) DeliveryOrderCreate(ctx context.Context, in *DeliveryOrd return out, nil } +func (c *expressClient) GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(DeliveryInfoResponse) + err := c.cc.Invoke(ctx, Express_GetDeliveryByOrderId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *expressClient) GetDeliveryBySupplyId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(DeliveryInfoResponse) + err := c.cc.Invoke(ctx, Express_GetDeliveryBySupplyId_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // ExpressServer is the server API for Express service. // All implementations must embed UnimplementedExpressServer // for forward compatibility. @@ -279,6 +303,8 @@ type ExpressServer interface { ExpressAdminCancel(context.Context, *IdRequest) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) + GetDeliveryByOrderId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) + GetDeliveryBySupplyId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) mustEmbedUnimplementedExpressServer() } @@ -343,6 +369,12 @@ func (UnimplementedExpressServer) ExpressAdminCancel(context.Context, *IdRequest func (UnimplementedExpressServer) DeliveryOrderCreate(context.Context, *DeliveryOrderCreateRequest) (*IdResponse, error) { return nil, status.Error(codes.Unimplemented, "method DeliveryOrderCreate not implemented") } +func (UnimplementedExpressServer) GetDeliveryByOrderId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) { + return nil, status.Error(codes.Unimplemented, "method GetDeliveryByOrderId not implemented") +} +func (UnimplementedExpressServer) GetDeliveryBySupplyId(context.Context, *IdRequest) (*DeliveryInfoResponse, error) { + return nil, status.Error(codes.Unimplemented, "method GetDeliveryBySupplyId not implemented") +} func (UnimplementedExpressServer) mustEmbedUnimplementedExpressServer() {} func (UnimplementedExpressServer) testEmbeddedByValue() {} @@ -688,6 +720,42 @@ func _Express_DeliveryOrderCreate_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _Express_GetDeliveryByOrderId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).GetDeliveryByOrderId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_GetDeliveryByOrderId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).GetDeliveryByOrderId(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Express_GetDeliveryBySupplyId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExpressServer).GetDeliveryBySupplyId(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Express_GetDeliveryBySupplyId_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExpressServer).GetDeliveryBySupplyId(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + // Express_ServiceDesc is the grpc.ServiceDesc for Express service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -767,6 +835,14 @@ var Express_ServiceDesc = grpc.ServiceDesc{ MethodName: "DeliveryOrderCreate", Handler: _Express_DeliveryOrderCreate_Handler, }, + { + MethodName: "GetDeliveryByOrderId", + Handler: _Express_GetDeliveryByOrderId_Handler, + }, + { + MethodName: "GetDeliveryBySupplyId", + Handler: _Express_GetDeliveryBySupplyId_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "express/express.proto", diff --git a/rpc/order/order.pb b/rpc/order/order.pb index 1af8a22e30b9837b6b0cd8ac9206026be8c8a781..caf09c5121cdace0ec17c0ab36bf89d7634736bc 100644 GIT binary patch delta 563 zcmew`iShUh#tn~+nI0KzerhbjB4EfR;#iOwTv||&Q|XzPmOt6RT50nS^LQ4_l9`(dH4)4P z*;5QQPl6R_KP%8fV4hLG@MImwxXog&2bg4IxVWJ~Qj(fmEF`H1Hc$_0si2$O`o-W7)XxN|w_?;1isa&fsD`**NCajC$g;`jounoQxeD__bwOOP z`I37zqr6ZE7biRrg~XxS;3AVRI7zz7HeG%)nMqtoNI$V46Up|(loXKNv0S`x^`JNv il14WL9MeFPCNFSi7ZnmlGX@l8o7)`wnJ4>tDgyw;gYm;8#tn~+nYy(%KQ$I%*{ov`$HH93B{MnSO?2`i8;QvQ7Q*U6;#};-i8-n9 znJE&?3XB@eL2MwdXNr&{7e{(gerW+nhGp{un+z6aqlE&Kr#i)Lp6Suey!n&UL8i?) LZsm-VReY2I#t0-H diff --git a/rpc/order/order.proto b/rpc/order/order.proto index 1c668c2..0287bc0 100644 --- a/rpc/order/order.proto +++ b/rpc/order/order.proto @@ -71,6 +71,12 @@ message IdRequest { int64 id = 1; } + +message ApiSupplyInfoRequest { + string order_sn = 1; +} + + message IdAndTypeRequest { int64 id = 1; int32 type = 2; @@ -191,6 +197,27 @@ message ProductItemsResponse { int32 number = 6; } +message ApiSupplyRequest { + string order_sn = 1; + string info = 2; + string reason = 3; + repeated string images = 4; +} + + +message StatusRequest { + int64 id = 1; + int32 status = 2; + string reason = 3; +} +message SupplyItemsRequest { + int32 page = 1; + int32 size = 2; + string order_sn = 3; + repeated string time = 4; + int32 status = 5; +} + service order { rpc Items(OrderItemsRequest) returns(Response){ option (google.api.http) = { @@ -199,6 +226,82 @@ service order { }; }; + rpc AddressItem(AddressItemsRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/address/items" + body: "*" + }; + }; + rpc AddressByStore(AddressByStoreItemsRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/address/store/items" + body: "*" + }; + }; + + rpc OrderAuditingItems(OrderAuditingItemsRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/order/auditing/items" + body: "*" + }; + }; + rpc OrderAuditing(OrderAuditingRequest) returns(Response){ + option (google.api.http) = { + post: "/admin/v3/order/auditing" + body: "*" + }; + }; + rpc OrderCreate(AdminCreateOrderRequest) returns(Response){ + option (google.api.http) = { + post: "/admin/v3/order/create" + body: "*" + }; + }; + rpc OrderDown(OrderItemsRequest) returns(ExcelExportResponse){ + option (google.api.http) = { + get: "/admin/v3/order/down" + body: "*" + }; + }; + rpc OrderInfo(IdRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/order/info" + body: "*" + }; + }; + rpc SupplyItems(SupplyItemsRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/supply/items" + body: "*" + }; + }; + rpc SupplyStatus(StatusRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/supply/status" + body: "*" + }; + }; + rpc UpdateAddressSaleInfo(UpdateAddressSaleInfoRequest) returns(UpdateAddressSaleInfoResponse); + rpc UpdateOrderDeliverStatus(UpdateOrderDeliverStatusRequest) returns(UpdateOrderDeliverStatusResponse); + //type 1为销售 2为门店 3为个人 + rpc GetOrderInfo(GetOrderInfoRequest) returns(OrderInfoResponse); + //status 1 为已支付 4 支付失败,其它的返回错误 + rpc UpdateOrderPayStatus(UpdateOrderPayStatusRequest) returns(UpdateOrderPayStatusResponse); + + /*****************API**********************/ + rpc ApiSupply(ApiSupplyRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/supply/add" + body: "*" + }; + }; + rpc ApiSupplyInfo(ApiSupplyInfoRequest) returns(Response){ + option (google.api.http) = { + get: "/api/v3/supply/info" + body: "*" + }; + }; + rpc WebCreate(CreateOrderRequest) returns(Response){ option (google.api.http) = { post: "/api/v3/order/create" @@ -262,54 +365,4 @@ service order { body: "*" }; }; - - rpc AddressItem(AddressItemsRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/address/items" - body: "*" - }; - }; - rpc AddressByStore(AddressByStoreItemsRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/address/store/items" - body: "*" - }; - }; - - rpc OrderAuditingItems(OrderAuditingItemsRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/order/auditing/items" - body: "*" - }; - }; - rpc OrderAuditing(OrderAuditingRequest) returns(Response){ - option (google.api.http) = { - post: "/admin/v3/order/auditing" - body: "*" - }; - }; - rpc OrderCreate(AdminCreateOrderRequest) returns(Response){ - option (google.api.http) = { - post: "/admin/v3/order/create" - body: "*" - }; - }; - rpc OrderDown(OrderItemsRequest) returns(ExcelExportResponse){ - option (google.api.http) = { - get: "/admin/v3/order/down" - body: "*" - }; - }; - rpc OrderInfo(IdRequest) returns(Response){ - option (google.api.http) = { - get: "/admin/v3/order/info" - body: "*" - }; - }; - rpc UpdateAddressSaleInfo(UpdateAddressSaleInfoRequest) returns(UpdateAddressSaleInfoResponse); - rpc UpdateOrderDeliverStatus(UpdateOrderDeliverStatusRequest) returns(UpdateOrderDeliverStatusResponse); - //type 1为销售 2为门店 3为个人 - rpc GetOrderInfo(GetOrderInfoRequest) returns(OrderInfoResponse); - //status 1 为已支付 4 支付失败,其它的返回错误 - rpc UpdateOrderPayStatus(UpdateOrderPayStatusRequest) returns(UpdateOrderPayStatusResponse); } \ No newline at end of file diff --git a/rpc/order/pb/order.pb.go b/rpc/order/pb/order.pb.go index 74f9359..a63a913 100644 --- a/rpc/order/pb/order.pb.go +++ b/rpc/order/pb/order.pb.go @@ -662,6 +662,50 @@ func (x *IdRequest) GetId() int64 { return 0 } +type ApiSupplyInfoRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + OrderSn string `protobuf:"bytes,1,opt,name=order_sn,json=orderSn,proto3" json:"order_sn,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiSupplyInfoRequest) Reset() { + *x = ApiSupplyInfoRequest{} + mi := &file_order_order_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiSupplyInfoRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiSupplyInfoRequest) ProtoMessage() {} + +func (x *ApiSupplyInfoRequest) ProtoReflect() protoreflect.Message { + mi := &file_order_order_proto_msgTypes[10] + 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 ApiSupplyInfoRequest.ProtoReflect.Descriptor instead. +func (*ApiSupplyInfoRequest) Descriptor() ([]byte, []int) { + return file_order_order_proto_rawDescGZIP(), []int{10} +} + +func (x *ApiSupplyInfoRequest) GetOrderSn() string { + if x != nil { + return x.OrderSn + } + return "" +} + type IdAndTypeRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` @@ -672,7 +716,7 @@ type IdAndTypeRequest struct { func (x *IdAndTypeRequest) Reset() { *x = IdAndTypeRequest{} - mi := &file_order_order_proto_msgTypes[10] + mi := &file_order_order_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -684,7 +728,7 @@ func (x *IdAndTypeRequest) String() string { func (*IdAndTypeRequest) ProtoMessage() {} func (x *IdAndTypeRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[10] + mi := &file_order_order_proto_msgTypes[11] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -697,7 +741,7 @@ func (x *IdAndTypeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use IdAndTypeRequest.ProtoReflect.Descriptor instead. func (*IdAndTypeRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{10} + return file_order_order_proto_rawDescGZIP(), []int{11} } func (x *IdAndTypeRequest) GetId() int64 { @@ -723,7 +767,7 @@ type TypeRequest struct { func (x *TypeRequest) Reset() { *x = TypeRequest{} - mi := &file_order_order_proto_msgTypes[11] + mi := &file_order_order_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -735,7 +779,7 @@ func (x *TypeRequest) String() string { func (*TypeRequest) ProtoMessage() {} func (x *TypeRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[11] + mi := &file_order_order_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -748,7 +792,7 @@ func (x *TypeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use TypeRequest.ProtoReflect.Descriptor instead. func (*TypeRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{11} + return file_order_order_proto_rawDescGZIP(), []int{12} } func (x *TypeRequest) GetType() int32 { @@ -774,7 +818,7 @@ type AddressItemsRequest struct { func (x *AddressItemsRequest) Reset() { *x = AddressItemsRequest{} - mi := &file_order_order_proto_msgTypes[12] + mi := &file_order_order_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -786,7 +830,7 @@ func (x *AddressItemsRequest) String() string { func (*AddressItemsRequest) ProtoMessage() {} func (x *AddressItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[12] + mi := &file_order_order_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -799,7 +843,7 @@ func (x *AddressItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AddressItemsRequest.ProtoReflect.Descriptor instead. func (*AddressItemsRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{12} + return file_order_order_proto_rawDescGZIP(), []int{13} } func (x *AddressItemsRequest) GetPage() int32 { @@ -867,7 +911,7 @@ type AddressByStoreItemsRequest struct { func (x *AddressByStoreItemsRequest) Reset() { *x = AddressByStoreItemsRequest{} - mi := &file_order_order_proto_msgTypes[13] + mi := &file_order_order_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -879,7 +923,7 @@ func (x *AddressByStoreItemsRequest) String() string { func (*AddressByStoreItemsRequest) ProtoMessage() {} func (x *AddressByStoreItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[13] + mi := &file_order_order_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -892,7 +936,7 @@ func (x *AddressByStoreItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AddressByStoreItemsRequest.ProtoReflect.Descriptor instead. func (*AddressByStoreItemsRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{13} + return file_order_order_proto_rawDescGZIP(), []int{14} } func (x *AddressByStoreItemsRequest) GetStoreId() int64 { @@ -914,7 +958,7 @@ type OrderAuditingItemsRequest struct { func (x *OrderAuditingItemsRequest) Reset() { *x = OrderAuditingItemsRequest{} - mi := &file_order_order_proto_msgTypes[14] + mi := &file_order_order_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -926,7 +970,7 @@ func (x *OrderAuditingItemsRequest) String() string { func (*OrderAuditingItemsRequest) ProtoMessage() {} func (x *OrderAuditingItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[14] + mi := &file_order_order_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -939,7 +983,7 @@ func (x *OrderAuditingItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderAuditingItemsRequest.ProtoReflect.Descriptor instead. func (*OrderAuditingItemsRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{14} + return file_order_order_proto_rawDescGZIP(), []int{15} } func (x *OrderAuditingItemsRequest) GetPage() int32 { @@ -981,7 +1025,7 @@ type OrderAuditingRequest struct { func (x *OrderAuditingRequest) Reset() { *x = OrderAuditingRequest{} - mi := &file_order_order_proto_msgTypes[15] + mi := &file_order_order_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -993,7 +1037,7 @@ func (x *OrderAuditingRequest) String() string { func (*OrderAuditingRequest) ProtoMessage() {} func (x *OrderAuditingRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[15] + mi := &file_order_order_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1006,7 +1050,7 @@ func (x *OrderAuditingRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderAuditingRequest.ProtoReflect.Descriptor instead. func (*OrderAuditingRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{15} + return file_order_order_proto_rawDescGZIP(), []int{16} } func (x *OrderAuditingRequest) GetId() int64 { @@ -1042,7 +1086,7 @@ type AdminCreateOrderRequest struct { func (x *AdminCreateOrderRequest) Reset() { *x = AdminCreateOrderRequest{} - mi := &file_order_order_proto_msgTypes[16] + mi := &file_order_order_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1054,7 +1098,7 @@ func (x *AdminCreateOrderRequest) String() string { func (*AdminCreateOrderRequest) ProtoMessage() {} func (x *AdminCreateOrderRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[16] + mi := &file_order_order_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1067,7 +1111,7 @@ func (x *AdminCreateOrderRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AdminCreateOrderRequest.ProtoReflect.Descriptor instead. func (*AdminCreateOrderRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{16} + return file_order_order_proto_rawDescGZIP(), []int{17} } func (x *AdminCreateOrderRequest) GetAddressId() int64 { @@ -1109,7 +1153,7 @@ type UpdateOrderDeliverStatusRequest struct { func (x *UpdateOrderDeliverStatusRequest) Reset() { *x = UpdateOrderDeliverStatusRequest{} - mi := &file_order_order_proto_msgTypes[17] + mi := &file_order_order_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1121,7 +1165,7 @@ func (x *UpdateOrderDeliverStatusRequest) String() string { func (*UpdateOrderDeliverStatusRequest) ProtoMessage() {} func (x *UpdateOrderDeliverStatusRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[17] + mi := &file_order_order_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1134,7 +1178,7 @@ func (x *UpdateOrderDeliverStatusRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateOrderDeliverStatusRequest.ProtoReflect.Descriptor instead. func (*UpdateOrderDeliverStatusRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{17} + return file_order_order_proto_rawDescGZIP(), []int{18} } func (x *UpdateOrderDeliverStatusRequest) GetSignTime() string { @@ -1171,7 +1215,7 @@ type UpdateOrderPayStatusRequest struct { func (x *UpdateOrderPayStatusRequest) Reset() { *x = UpdateOrderPayStatusRequest{} - mi := &file_order_order_proto_msgTypes[18] + mi := &file_order_order_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1183,7 +1227,7 @@ func (x *UpdateOrderPayStatusRequest) String() string { func (*UpdateOrderPayStatusRequest) ProtoMessage() {} func (x *UpdateOrderPayStatusRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[18] + mi := &file_order_order_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1196,7 +1240,7 @@ func (x *UpdateOrderPayStatusRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateOrderPayStatusRequest.ProtoReflect.Descriptor instead. func (*UpdateOrderPayStatusRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{18} + return file_order_order_proto_rawDescGZIP(), []int{19} } func (x *UpdateOrderPayStatusRequest) GetOrderSn() string { @@ -1243,7 +1287,7 @@ type UpdateOrderPayStatusResponse struct { func (x *UpdateOrderPayStatusResponse) Reset() { *x = UpdateOrderPayStatusResponse{} - mi := &file_order_order_proto_msgTypes[19] + mi := &file_order_order_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1255,7 +1299,7 @@ func (x *UpdateOrderPayStatusResponse) String() string { func (*UpdateOrderPayStatusResponse) ProtoMessage() {} func (x *UpdateOrderPayStatusResponse) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[19] + mi := &file_order_order_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1268,7 +1312,7 @@ func (x *UpdateOrderPayStatusResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateOrderPayStatusResponse.ProtoReflect.Descriptor instead. func (*UpdateOrderPayStatusResponse) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{19} + return file_order_order_proto_rawDescGZIP(), []int{20} } func (x *UpdateOrderPayStatusResponse) GetId() int64 { @@ -1287,7 +1331,7 @@ type UpdateOrderDeliverStatusResponse struct { func (x *UpdateOrderDeliverStatusResponse) Reset() { *x = UpdateOrderDeliverStatusResponse{} - mi := &file_order_order_proto_msgTypes[20] + mi := &file_order_order_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1299,7 +1343,7 @@ func (x *UpdateOrderDeliverStatusResponse) String() string { func (*UpdateOrderDeliverStatusResponse) ProtoMessage() {} func (x *UpdateOrderDeliverStatusResponse) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[20] + mi := &file_order_order_proto_msgTypes[21] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1312,7 +1356,7 @@ func (x *UpdateOrderDeliverStatusResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateOrderDeliverStatusResponse.ProtoReflect.Descriptor instead. func (*UpdateOrderDeliverStatusResponse) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{20} + return file_order_order_proto_rawDescGZIP(), []int{21} } func (x *UpdateOrderDeliverStatusResponse) GetNum() int32 { @@ -1331,7 +1375,7 @@ type UpdateAddressSaleInfoResponse struct { func (x *UpdateAddressSaleInfoResponse) Reset() { *x = UpdateAddressSaleInfoResponse{} - mi := &file_order_order_proto_msgTypes[21] + mi := &file_order_order_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1343,7 +1387,7 @@ func (x *UpdateAddressSaleInfoResponse) String() string { func (*UpdateAddressSaleInfoResponse) ProtoMessage() {} func (x *UpdateAddressSaleInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[21] + mi := &file_order_order_proto_msgTypes[22] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1356,7 +1400,7 @@ func (x *UpdateAddressSaleInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateAddressSaleInfoResponse.ProtoReflect.Descriptor instead. func (*UpdateAddressSaleInfoResponse) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{21} + return file_order_order_proto_rawDescGZIP(), []int{22} } func (x *UpdateAddressSaleInfoResponse) GetNum() int32 { @@ -1369,16 +1413,15 @@ func (x *UpdateAddressSaleInfoResponse) GetNum() int32 { type UpdateAddressSaleInfoRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - Type int32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"` - SaleId int64 `protobuf:"varint,3,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"` - GroupId int64 `protobuf:"varint,4,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"` + SaleId int64 `protobuf:"varint,2,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"` + GroupId int64 `protobuf:"varint,3,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } func (x *UpdateAddressSaleInfoRequest) Reset() { *x = UpdateAddressSaleInfoRequest{} - mi := &file_order_order_proto_msgTypes[22] + mi := &file_order_order_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1390,7 +1433,7 @@ func (x *UpdateAddressSaleInfoRequest) String() string { func (*UpdateAddressSaleInfoRequest) ProtoMessage() {} func (x *UpdateAddressSaleInfoRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[22] + mi := &file_order_order_proto_msgTypes[23] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1403,7 +1446,7 @@ func (x *UpdateAddressSaleInfoRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateAddressSaleInfoRequest.ProtoReflect.Descriptor instead. func (*UpdateAddressSaleInfoRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{22} + return file_order_order_proto_rawDescGZIP(), []int{23} } func (x *UpdateAddressSaleInfoRequest) GetId() int64 { @@ -1413,13 +1456,6 @@ func (x *UpdateAddressSaleInfoRequest) GetId() int64 { return 0 } -func (x *UpdateAddressSaleInfoRequest) GetType() int32 { - if x != nil { - return x.Type - } - return 0 -} - func (x *UpdateAddressSaleInfoRequest) GetSaleId() int64 { if x != nil { return x.SaleId @@ -1445,7 +1481,7 @@ type GetOrderInfoRequest struct { func (x *GetOrderInfoRequest) Reset() { *x = GetOrderInfoRequest{} - mi := &file_order_order_proto_msgTypes[23] + mi := &file_order_order_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1457,7 +1493,7 @@ func (x *GetOrderInfoRequest) String() string { func (*GetOrderInfoRequest) ProtoMessage() {} func (x *GetOrderInfoRequest) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[23] + mi := &file_order_order_proto_msgTypes[24] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1470,7 +1506,7 @@ func (x *GetOrderInfoRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetOrderInfoRequest.ProtoReflect.Descriptor instead. func (*GetOrderInfoRequest) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{23} + return file_order_order_proto_rawDescGZIP(), []int{24} } func (x *GetOrderInfoRequest) GetUserId() int64 { @@ -1529,7 +1565,7 @@ type OrderInfoResponse struct { func (x *OrderInfoResponse) Reset() { *x = OrderInfoResponse{} - mi := &file_order_order_proto_msgTypes[24] + mi := &file_order_order_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1541,7 +1577,7 @@ func (x *OrderInfoResponse) String() string { func (*OrderInfoResponse) ProtoMessage() {} func (x *OrderInfoResponse) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[24] + mi := &file_order_order_proto_msgTypes[25] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1554,7 +1590,7 @@ func (x *OrderInfoResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use OrderInfoResponse.ProtoReflect.Descriptor instead. func (*OrderInfoResponse) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{24} + return file_order_order_proto_rawDescGZIP(), []int{25} } func (x *OrderInfoResponse) GetId() int64 { @@ -1760,7 +1796,7 @@ type ProductItemsResponse struct { func (x *ProductItemsResponse) Reset() { *x = ProductItemsResponse{} - mi := &file_order_order_proto_msgTypes[25] + mi := &file_order_order_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1772,7 +1808,7 @@ func (x *ProductItemsResponse) String() string { func (*ProductItemsResponse) ProtoMessage() {} func (x *ProductItemsResponse) ProtoReflect() protoreflect.Message { - mi := &file_order_order_proto_msgTypes[25] + mi := &file_order_order_proto_msgTypes[26] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1785,7 +1821,7 @@ func (x *ProductItemsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ProductItemsResponse.ProtoReflect.Descriptor instead. func (*ProductItemsResponse) Descriptor() ([]byte, []int) { - return file_order_order_proto_rawDescGZIP(), []int{25} + return file_order_order_proto_rawDescGZIP(), []int{26} } func (x *ProductItemsResponse) GetId() int64 { @@ -1830,6 +1866,210 @@ func (x *ProductItemsResponse) GetNumber() int32 { return 0 } +type ApiSupplyRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + OrderSn string `protobuf:"bytes,1,opt,name=order_sn,json=orderSn,proto3" json:"order_sn,omitempty"` + Info string `protobuf:"bytes,2,opt,name=info,proto3" json:"info,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` + Images []string `protobuf:"bytes,4,rep,name=images,proto3" json:"images,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiSupplyRequest) Reset() { + *x = ApiSupplyRequest{} + mi := &file_order_order_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiSupplyRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiSupplyRequest) ProtoMessage() {} + +func (x *ApiSupplyRequest) ProtoReflect() protoreflect.Message { + mi := &file_order_order_proto_msgTypes[27] + 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 ApiSupplyRequest.ProtoReflect.Descriptor instead. +func (*ApiSupplyRequest) Descriptor() ([]byte, []int) { + return file_order_order_proto_rawDescGZIP(), []int{27} +} + +func (x *ApiSupplyRequest) GetOrderSn() string { + if x != nil { + return x.OrderSn + } + return "" +} + +func (x *ApiSupplyRequest) GetInfo() string { + if x != nil { + return x.Info + } + return "" +} + +func (x *ApiSupplyRequest) GetReason() string { + if x != nil { + return x.Reason + } + return "" +} + +func (x *ApiSupplyRequest) GetImages() []string { + if x != nil { + return x.Images + } + return nil +} + +type StatusRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Status int32 `protobuf:"varint,2,opt,name=status,proto3" json:"status,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *StatusRequest) Reset() { + *x = StatusRequest{} + mi := &file_order_order_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *StatusRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*StatusRequest) ProtoMessage() {} + +func (x *StatusRequest) ProtoReflect() protoreflect.Message { + mi := &file_order_order_proto_msgTypes[28] + 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 StatusRequest.ProtoReflect.Descriptor instead. +func (*StatusRequest) Descriptor() ([]byte, []int) { + return file_order_order_proto_rawDescGZIP(), []int{28} +} + +func (x *StatusRequest) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *StatusRequest) GetStatus() int32 { + if x != nil { + return x.Status + } + return 0 +} + +func (x *StatusRequest) GetReason() string { + if x != nil { + return x.Reason + } + return "" +} + +type SupplyItemsRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Page int32 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` + Size int32 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` + OrderSn string `protobuf:"bytes,3,opt,name=order_sn,json=orderSn,proto3" json:"order_sn,omitempty"` + Time []string `protobuf:"bytes,4,rep,name=time,proto3" json:"time,omitempty"` + Status int32 `protobuf:"varint,5,opt,name=status,proto3" json:"status,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SupplyItemsRequest) Reset() { + *x = SupplyItemsRequest{} + mi := &file_order_order_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SupplyItemsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SupplyItemsRequest) ProtoMessage() {} + +func (x *SupplyItemsRequest) ProtoReflect() protoreflect.Message { + mi := &file_order_order_proto_msgTypes[29] + 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 SupplyItemsRequest.ProtoReflect.Descriptor instead. +func (*SupplyItemsRequest) Descriptor() ([]byte, []int) { + return file_order_order_proto_rawDescGZIP(), []int{29} +} + +func (x *SupplyItemsRequest) GetPage() int32 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *SupplyItemsRequest) GetSize() int32 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *SupplyItemsRequest) GetOrderSn() string { + if x != nil { + return x.OrderSn + } + return "" +} + +func (x *SupplyItemsRequest) GetTime() []string { + if x != nil { + return x.Time + } + return nil +} + +func (x *SupplyItemsRequest) GetStatus() int32 { + if x != nil { + return x.Status + } + return 0 +} + var File_order_order_proto protoreflect.FileDescriptor const file_order_order_proto_rawDesc = "" + @@ -1883,7 +2123,9 @@ const file_order_order_proto_rawDesc = "" + "\vCartRequest\x12\x12\n" + "\x04type\x18\x01 \x01(\x05R\x04type\"\x1b\n" + "\tIdRequest\x12\x0e\n" + - "\x02id\x18\x01 \x01(\x03R\x02id\"6\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"1\n" + + "\x14ApiSupplyInfoRequest\x12\x19\n" + + "\border_sn\x18\x01 \x01(\tR\aorderSn\"6\n" + "\x10IdAndTypeRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" + "\x04type\x18\x02 \x01(\x05R\x04type\"!\n" + @@ -1931,12 +2173,11 @@ const file_order_order_proto_rawDesc = "" + " UpdateOrderDeliverStatusResponse\x12\x10\n" + "\x03num\x18\x01 \x01(\x05R\x03num\"1\n" + "\x1dUpdateAddressSaleInfoResponse\x12\x10\n" + - "\x03num\x18\x01 \x01(\x05R\x03num\"v\n" + + "\x03num\x18\x01 \x01(\x05R\x03num\"b\n" + "\x1cUpdateAddressSaleInfoRequest\x12\x0e\n" + - "\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" + - "\x04type\x18\x02 \x01(\x05R\x04type\x12\x17\n" + - "\asale_id\x18\x03 \x01(\x03R\x06saleId\x12\x19\n" + - "\bgroup_id\x18\x04 \x01(\x03R\agroupId\"]\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x17\n" + + "\asale_id\x18\x02 \x01(\x03R\x06saleId\x12\x19\n" + + "\bgroup_id\x18\x03 \x01(\x03R\agroupId\"]\n" + "\x13GetOrderInfoRequest\x12\x17\n" + "\auser_id\x18\x01 \x01(\x03R\x06userId\x12\x19\n" + "\border_sn\x18\x02 \x01(\tR\aorderSn\x12\x12\n" + @@ -1983,9 +2224,39 @@ const file_order_order_proto_rawDesc = "" + "product_id\x18\x03 \x01(\x03R\tproductId\x12!\n" + "\fproduct_name\x18\x04 \x01(\tR\vproductName\x12\x14\n" + "\x05price\x18\x05 \x01(\x01R\x05price\x12\x16\n" + - "\x06number\x18\x06 \x01(\x05R\x06number2\xa1\x10\n" + + "\x06number\x18\x06 \x01(\x05R\x06number\"q\n" + + "\x10ApiSupplyRequest\x12\x19\n" + + "\border_sn\x18\x01 \x01(\tR\aorderSn\x12\x12\n" + + "\x04info\x18\x02 \x01(\tR\x04info\x12\x16\n" + + "\x06reason\x18\x03 \x01(\tR\x06reason\x12\x16\n" + + "\x06images\x18\x04 \x03(\tR\x06images\"O\n" + + "\rStatusRequest\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" + + "\x06status\x18\x02 \x01(\x05R\x06status\x12\x16\n" + + "\x06reason\x18\x03 \x01(\tR\x06reason\"\x83\x01\n" + + "\x12SupplyItemsRequest\x12\x12\n" + + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + + "\x04size\x18\x02 \x01(\x05R\x04size\x12\x19\n" + + "\border_sn\x18\x03 \x01(\tR\aorderSn\x12\x12\n" + + "\x04time\x18\x04 \x03(\tR\x04time\x12\x16\n" + + "\x06status\x18\x05 \x01(\x05R\x06status2\x8f\x13\n" + "\x05order\x12T\n" + - "\x05Items\x12\x18.order.OrderItemsRequest\x1a\x0f.order.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/admin/v3/order/items\x12X\n" + + "\x05Items\x12\x18.order.OrderItemsRequest\x1a\x0f.order.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/admin/v3/order/items\x12^\n" + + "\vAddressItem\x12\x1a.order.AddressItemsRequest\x1a\x0f.order.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/address/items\x12n\n" + + "\x0eAddressByStore\x12!.order.AddressByStoreItemsRequest\x1a\x0f.order.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/admin/v3/address/store/items\x12r\n" + + "\x12OrderAuditingItems\x12 .order.OrderAuditingItemsRequest\x1a\x0f.order.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/admin/v3/order/auditing/items\x12b\n" + + "\rOrderAuditing\x12\x1b.order.OrderAuditingRequest\x1a\x0f.order.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/order/auditing\x12a\n" + + "\vOrderCreate\x12\x1e.order.AdminCreateOrderRequest\x1a\x0f.order.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/admin/v3/order/create\x12b\n" + + "\tOrderDown\x12\x18.order.OrderItemsRequest\x1a\x1a.order.ExcelExportResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/admin/v3/order/down\x12O\n" + + "\tOrderInfo\x12\x10.order.IdRequest\x1a\x0f.order.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/admin/v3/order/info\x12\\\n" + + "\vSupplyItems\x12\x19.order.SupplyItemsRequest\x1a\x0f.order.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/admin/v3/supply/items\x12Y\n" + + "\fSupplyStatus\x12\x14.order.StatusRequest\x1a\x0f.order.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/supply/status\x12b\n" + + "\x15UpdateAddressSaleInfo\x12#.order.UpdateAddressSaleInfoRequest\x1a$.order.UpdateAddressSaleInfoResponse\x12k\n" + + "\x18UpdateOrderDeliverStatus\x12&.order.UpdateOrderDeliverStatusRequest\x1a'.order.UpdateOrderDeliverStatusResponse\x12D\n" + + "\fGetOrderInfo\x12\x1a.order.GetOrderInfoRequest\x1a\x18.order.OrderInfoResponse\x12_\n" + + "\x14UpdateOrderPayStatus\x12\".order.UpdateOrderPayStatusRequest\x1a#.order.UpdateOrderPayStatusResponse\x12T\n" + + "\tApiSupply\x12\x17.order.ApiSupplyRequest\x1a\x0f.order.Response\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\x12\x12/api/v3/supply/add\x12]\n" + + "\rApiSupplyInfo\x12\x1b.order.ApiSupplyInfoRequest\x1a\x0f.order.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\x12\x13/api/v3/supply/info\x12X\n" + "\tWebCreate\x12\x19.order.CreateOrderRequest\x1a\x0f.order.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/api/v3/order/create\x12b\n" + "\fWebCreateOne\x12\x1c.order.CreateOrderOneRequest\x1a\x0f.order.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/v3/order/create/one\x12a\n" + "\x10WebAddressCreate\x12\x19.order.EditAddressRequest\x1a\x0f.order.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/api/v3/address/create\x12]\n" + @@ -1995,18 +2266,7 @@ const file_order_order_proto_rawDesc = "" + "\x0eWebAddressInfo\x12\x17.order.IdAndTypeRequest\x1a\x0f.order.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/api/v3/address/info\x12X\n" + "\x0fWebAddressItems\x12\x12.order.TypeRequest\x1a\x0f.order.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/api/v3/address/items\x12G\n" + "\aWebCart\x12\x12.order.CartRequest\x1a\x0f.order.Response\"\x17\x82\xd3\xe4\x93\x02\x11:\x01*\x12\f/api/v3/cart\x12T\n" + - "\vWebCartEdit\x12\x16.order.EditCartRequest\x1a\x0f.order.Response\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v3/cart/edit\x12^\n" + - "\vAddressItem\x12\x1a.order.AddressItemsRequest\x1a\x0f.order.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/address/items\x12n\n" + - "\x0eAddressByStore\x12!.order.AddressByStoreItemsRequest\x1a\x0f.order.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/admin/v3/address/store/items\x12r\n" + - "\x12OrderAuditingItems\x12 .order.OrderAuditingItemsRequest\x1a\x0f.order.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/admin/v3/order/auditing/items\x12b\n" + - "\rOrderAuditing\x12\x1b.order.OrderAuditingRequest\x1a\x0f.order.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/order/auditing\x12a\n" + - "\vOrderCreate\x12\x1e.order.AdminCreateOrderRequest\x1a\x0f.order.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/admin/v3/order/create\x12b\n" + - "\tOrderDown\x12\x18.order.OrderItemsRequest\x1a\x1a.order.ExcelExportResponse\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/admin/v3/order/down\x12O\n" + - "\tOrderInfo\x12\x10.order.IdRequest\x1a\x0f.order.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/admin/v3/order/info\x12b\n" + - "\x15UpdateAddressSaleInfo\x12#.order.UpdateAddressSaleInfoRequest\x1a$.order.UpdateAddressSaleInfoResponse\x12k\n" + - "\x18UpdateOrderDeliverStatus\x12&.order.UpdateOrderDeliverStatusRequest\x1a'.order.UpdateOrderDeliverStatusResponse\x12D\n" + - "\fGetOrderInfo\x12\x1a.order.GetOrderInfoRequest\x1a\x18.order.OrderInfoResponse\x12_\n" + - "\x14UpdateOrderPayStatus\x12\".order.UpdateOrderPayStatusRequest\x1a#.order.UpdateOrderPayStatusResponseB\x19Z\x17lone-services/rpc/orderb\x06proto3" + "\vWebCartEdit\x12\x16.order.EditCartRequest\x1a\x0f.order.Response\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/v3/cart/editB\x19Z\x17lone-services/rpc/orderb\x06proto3" var ( file_order_order_proto_rawDescOnce sync.Once @@ -2020,7 +2280,7 @@ func file_order_order_proto_rawDescGZIP() []byte { return file_order_order_proto_rawDescData } -var file_order_order_proto_msgTypes = make([]protoimpl.MessageInfo, 26) +var file_order_order_proto_msgTypes = make([]protoimpl.MessageInfo, 30) var file_order_order_proto_goTypes = []any{ (*OrderItemsRequest)(nil), // 0: order.OrderItemsRequest (*Response)(nil), // 1: order.Response @@ -2032,71 +2292,83 @@ var file_order_order_proto_goTypes = []any{ (*EditCartRequest)(nil), // 7: order.EditCartRequest (*CartRequest)(nil), // 8: order.CartRequest (*IdRequest)(nil), // 9: order.IdRequest - (*IdAndTypeRequest)(nil), // 10: order.IdAndTypeRequest - (*TypeRequest)(nil), // 11: order.TypeRequest - (*AddressItemsRequest)(nil), // 12: order.AddressItemsRequest - (*AddressByStoreItemsRequest)(nil), // 13: order.AddressByStoreItemsRequest - (*OrderAuditingItemsRequest)(nil), // 14: order.OrderAuditingItemsRequest - (*OrderAuditingRequest)(nil), // 15: order.OrderAuditingRequest - (*AdminCreateOrderRequest)(nil), // 16: order.AdminCreateOrderRequest - (*UpdateOrderDeliverStatusRequest)(nil), // 17: order.UpdateOrderDeliverStatusRequest - (*UpdateOrderPayStatusRequest)(nil), // 18: order.UpdateOrderPayStatusRequest - (*UpdateOrderPayStatusResponse)(nil), // 19: order.UpdateOrderPayStatusResponse - (*UpdateOrderDeliverStatusResponse)(nil), // 20: order.UpdateOrderDeliverStatusResponse - (*UpdateAddressSaleInfoResponse)(nil), // 21: order.UpdateAddressSaleInfoResponse - (*UpdateAddressSaleInfoRequest)(nil), // 22: order.UpdateAddressSaleInfoRequest - (*GetOrderInfoRequest)(nil), // 23: order.GetOrderInfoRequest - (*OrderInfoResponse)(nil), // 24: order.OrderInfoResponse - (*ProductItemsResponse)(nil), // 25: order.ProductItemsResponse + (*ApiSupplyInfoRequest)(nil), // 10: order.ApiSupplyInfoRequest + (*IdAndTypeRequest)(nil), // 11: order.IdAndTypeRequest + (*TypeRequest)(nil), // 12: order.TypeRequest + (*AddressItemsRequest)(nil), // 13: order.AddressItemsRequest + (*AddressByStoreItemsRequest)(nil), // 14: order.AddressByStoreItemsRequest + (*OrderAuditingItemsRequest)(nil), // 15: order.OrderAuditingItemsRequest + (*OrderAuditingRequest)(nil), // 16: order.OrderAuditingRequest + (*AdminCreateOrderRequest)(nil), // 17: order.AdminCreateOrderRequest + (*UpdateOrderDeliverStatusRequest)(nil), // 18: order.UpdateOrderDeliverStatusRequest + (*UpdateOrderPayStatusRequest)(nil), // 19: order.UpdateOrderPayStatusRequest + (*UpdateOrderPayStatusResponse)(nil), // 20: order.UpdateOrderPayStatusResponse + (*UpdateOrderDeliverStatusResponse)(nil), // 21: order.UpdateOrderDeliverStatusResponse + (*UpdateAddressSaleInfoResponse)(nil), // 22: order.UpdateAddressSaleInfoResponse + (*UpdateAddressSaleInfoRequest)(nil), // 23: order.UpdateAddressSaleInfoRequest + (*GetOrderInfoRequest)(nil), // 24: order.GetOrderInfoRequest + (*OrderInfoResponse)(nil), // 25: order.OrderInfoResponse + (*ProductItemsResponse)(nil), // 26: order.ProductItemsResponse + (*ApiSupplyRequest)(nil), // 27: order.ApiSupplyRequest + (*StatusRequest)(nil), // 28: order.StatusRequest + (*SupplyItemsRequest)(nil), // 29: order.SupplyItemsRequest } var file_order_order_proto_depIdxs = []int32{ - 25, // 0: order.OrderInfoResponse.product_items:type_name -> order.ProductItemsResponse + 26, // 0: order.OrderInfoResponse.product_items:type_name -> order.ProductItemsResponse 0, // 1: order.order.Items:input_type -> order.OrderItemsRequest - 3, // 2: order.order.WebCreate:input_type -> order.CreateOrderRequest - 4, // 3: order.order.WebCreateOne:input_type -> order.CreateOrderOneRequest - 5, // 4: order.order.WebAddressCreate:input_type -> order.EditAddressRequest - 5, // 5: order.order.WebAddressEdit:input_type -> order.EditAddressRequest - 10, // 6: order.order.WebAddressDel:input_type -> order.IdAndTypeRequest - 10, // 7: order.order.WebAddressDef:input_type -> order.IdAndTypeRequest - 10, // 8: order.order.WebAddressInfo:input_type -> order.IdAndTypeRequest - 11, // 9: order.order.WebAddressItems:input_type -> order.TypeRequest - 8, // 10: order.order.WebCart:input_type -> order.CartRequest - 7, // 11: order.order.WebCartEdit:input_type -> order.EditCartRequest - 12, // 12: order.order.AddressItem:input_type -> order.AddressItemsRequest - 13, // 13: order.order.AddressByStore:input_type -> order.AddressByStoreItemsRequest - 14, // 14: order.order.OrderAuditingItems:input_type -> order.OrderAuditingItemsRequest - 15, // 15: order.order.OrderAuditing:input_type -> order.OrderAuditingRequest - 16, // 16: order.order.OrderCreate:input_type -> order.AdminCreateOrderRequest - 0, // 17: order.order.OrderDown:input_type -> order.OrderItemsRequest - 9, // 18: order.order.OrderInfo:input_type -> order.IdRequest - 22, // 19: order.order.UpdateAddressSaleInfo:input_type -> order.UpdateAddressSaleInfoRequest - 17, // 20: order.order.UpdateOrderDeliverStatus:input_type -> order.UpdateOrderDeliverStatusRequest - 23, // 21: order.order.GetOrderInfo:input_type -> order.GetOrderInfoRequest - 18, // 22: order.order.UpdateOrderPayStatus:input_type -> order.UpdateOrderPayStatusRequest - 1, // 23: order.order.Items:output_type -> order.Response - 1, // 24: order.order.WebCreate:output_type -> order.Response - 1, // 25: order.order.WebCreateOne:output_type -> order.Response - 1, // 26: order.order.WebAddressCreate:output_type -> order.Response - 1, // 27: order.order.WebAddressEdit:output_type -> order.Response - 1, // 28: order.order.WebAddressDel:output_type -> order.Response - 1, // 29: order.order.WebAddressDef:output_type -> order.Response - 1, // 30: order.order.WebAddressInfo:output_type -> order.Response - 1, // 31: order.order.WebAddressItems:output_type -> order.Response - 1, // 32: order.order.WebCart:output_type -> order.Response - 1, // 33: order.order.WebCartEdit:output_type -> order.Response - 1, // 34: order.order.AddressItem:output_type -> order.Response - 1, // 35: order.order.AddressByStore:output_type -> order.Response - 1, // 36: order.order.OrderAuditingItems:output_type -> order.Response - 1, // 37: order.order.OrderAuditing:output_type -> order.Response - 1, // 38: order.order.OrderCreate:output_type -> order.Response - 2, // 39: order.order.OrderDown:output_type -> order.ExcelExportResponse - 1, // 40: order.order.OrderInfo:output_type -> order.Response - 21, // 41: order.order.UpdateAddressSaleInfo:output_type -> order.UpdateAddressSaleInfoResponse - 20, // 42: order.order.UpdateOrderDeliverStatus:output_type -> order.UpdateOrderDeliverStatusResponse - 24, // 43: order.order.GetOrderInfo:output_type -> order.OrderInfoResponse - 19, // 44: order.order.UpdateOrderPayStatus:output_type -> order.UpdateOrderPayStatusResponse - 23, // [23:45] is the sub-list for method output_type - 1, // [1:23] is the sub-list for method input_type + 13, // 2: order.order.AddressItem:input_type -> order.AddressItemsRequest + 14, // 3: order.order.AddressByStore:input_type -> order.AddressByStoreItemsRequest + 15, // 4: order.order.OrderAuditingItems:input_type -> order.OrderAuditingItemsRequest + 16, // 5: order.order.OrderAuditing:input_type -> order.OrderAuditingRequest + 17, // 6: order.order.OrderCreate:input_type -> order.AdminCreateOrderRequest + 0, // 7: order.order.OrderDown:input_type -> order.OrderItemsRequest + 9, // 8: order.order.OrderInfo:input_type -> order.IdRequest + 29, // 9: order.order.SupplyItems:input_type -> order.SupplyItemsRequest + 28, // 10: order.order.SupplyStatus:input_type -> order.StatusRequest + 23, // 11: order.order.UpdateAddressSaleInfo:input_type -> order.UpdateAddressSaleInfoRequest + 18, // 12: order.order.UpdateOrderDeliverStatus:input_type -> order.UpdateOrderDeliverStatusRequest + 24, // 13: order.order.GetOrderInfo:input_type -> order.GetOrderInfoRequest + 19, // 14: order.order.UpdateOrderPayStatus:input_type -> order.UpdateOrderPayStatusRequest + 27, // 15: order.order.ApiSupply:input_type -> order.ApiSupplyRequest + 10, // 16: order.order.ApiSupplyInfo:input_type -> order.ApiSupplyInfoRequest + 3, // 17: order.order.WebCreate:input_type -> order.CreateOrderRequest + 4, // 18: order.order.WebCreateOne:input_type -> order.CreateOrderOneRequest + 5, // 19: order.order.WebAddressCreate:input_type -> order.EditAddressRequest + 5, // 20: order.order.WebAddressEdit:input_type -> order.EditAddressRequest + 11, // 21: order.order.WebAddressDel:input_type -> order.IdAndTypeRequest + 11, // 22: order.order.WebAddressDef:input_type -> order.IdAndTypeRequest + 11, // 23: order.order.WebAddressInfo:input_type -> order.IdAndTypeRequest + 12, // 24: order.order.WebAddressItems:input_type -> order.TypeRequest + 8, // 25: order.order.WebCart:input_type -> order.CartRequest + 7, // 26: order.order.WebCartEdit:input_type -> order.EditCartRequest + 1, // 27: order.order.Items:output_type -> order.Response + 1, // 28: order.order.AddressItem:output_type -> order.Response + 1, // 29: order.order.AddressByStore:output_type -> order.Response + 1, // 30: order.order.OrderAuditingItems:output_type -> order.Response + 1, // 31: order.order.OrderAuditing:output_type -> order.Response + 1, // 32: order.order.OrderCreate:output_type -> order.Response + 2, // 33: order.order.OrderDown:output_type -> order.ExcelExportResponse + 1, // 34: order.order.OrderInfo:output_type -> order.Response + 1, // 35: order.order.SupplyItems:output_type -> order.Response + 1, // 36: order.order.SupplyStatus:output_type -> order.Response + 22, // 37: order.order.UpdateAddressSaleInfo:output_type -> order.UpdateAddressSaleInfoResponse + 21, // 38: order.order.UpdateOrderDeliverStatus:output_type -> order.UpdateOrderDeliverStatusResponse + 25, // 39: order.order.GetOrderInfo:output_type -> order.OrderInfoResponse + 20, // 40: order.order.UpdateOrderPayStatus:output_type -> order.UpdateOrderPayStatusResponse + 1, // 41: order.order.ApiSupply:output_type -> order.Response + 1, // 42: order.order.ApiSupplyInfo:output_type -> order.Response + 1, // 43: order.order.WebCreate:output_type -> order.Response + 1, // 44: order.order.WebCreateOne:output_type -> order.Response + 1, // 45: order.order.WebAddressCreate:output_type -> order.Response + 1, // 46: order.order.WebAddressEdit:output_type -> order.Response + 1, // 47: order.order.WebAddressDel:output_type -> order.Response + 1, // 48: order.order.WebAddressDef:output_type -> order.Response + 1, // 49: order.order.WebAddressInfo:output_type -> order.Response + 1, // 50: order.order.WebAddressItems:output_type -> order.Response + 1, // 51: order.order.WebCart:output_type -> order.Response + 1, // 52: order.order.WebCartEdit:output_type -> order.Response + 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 @@ -2113,7 +2385,7 @@ func file_order_order_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_order_order_proto_rawDesc), len(file_order_order_proto_rawDesc)), NumEnums: 0, - NumMessages: 26, + NumMessages: 30, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/order/pb/order_grpc.pb.go b/rpc/order/pb/order_grpc.pb.go index 1f761ef..e6539a9 100644 --- a/rpc/order/pb/order_grpc.pb.go +++ b/rpc/order/pb/order_grpc.pb.go @@ -20,6 +20,21 @@ const _ = grpc.SupportPackageIsVersion9 const ( Order_Items_FullMethodName = "/order.order/Items" + Order_AddressItem_FullMethodName = "/order.order/AddressItem" + Order_AddressByStore_FullMethodName = "/order.order/AddressByStore" + Order_OrderAuditingItems_FullMethodName = "/order.order/OrderAuditingItems" + Order_OrderAuditing_FullMethodName = "/order.order/OrderAuditing" + Order_OrderCreate_FullMethodName = "/order.order/OrderCreate" + Order_OrderDown_FullMethodName = "/order.order/OrderDown" + Order_OrderInfo_FullMethodName = "/order.order/OrderInfo" + Order_SupplyItems_FullMethodName = "/order.order/SupplyItems" + Order_SupplyStatus_FullMethodName = "/order.order/SupplyStatus" + Order_UpdateAddressSaleInfo_FullMethodName = "/order.order/UpdateAddressSaleInfo" + Order_UpdateOrderDeliverStatus_FullMethodName = "/order.order/UpdateOrderDeliverStatus" + Order_GetOrderInfo_FullMethodName = "/order.order/GetOrderInfo" + Order_UpdateOrderPayStatus_FullMethodName = "/order.order/UpdateOrderPayStatus" + Order_ApiSupply_FullMethodName = "/order.order/ApiSupply" + Order_ApiSupplyInfo_FullMethodName = "/order.order/ApiSupplyInfo" Order_WebCreate_FullMethodName = "/order.order/WebCreate" Order_WebCreateOne_FullMethodName = "/order.order/WebCreateOne" Order_WebAddressCreate_FullMethodName = "/order.order/WebAddressCreate" @@ -30,17 +45,6 @@ const ( Order_WebAddressItems_FullMethodName = "/order.order/WebAddressItems" Order_WebCart_FullMethodName = "/order.order/WebCart" Order_WebCartEdit_FullMethodName = "/order.order/WebCartEdit" - Order_AddressItem_FullMethodName = "/order.order/AddressItem" - Order_AddressByStore_FullMethodName = "/order.order/AddressByStore" - Order_OrderAuditingItems_FullMethodName = "/order.order/OrderAuditingItems" - Order_OrderAuditing_FullMethodName = "/order.order/OrderAuditing" - Order_OrderCreate_FullMethodName = "/order.order/OrderCreate" - Order_OrderDown_FullMethodName = "/order.order/OrderDown" - Order_OrderInfo_FullMethodName = "/order.order/OrderInfo" - Order_UpdateAddressSaleInfo_FullMethodName = "/order.order/UpdateAddressSaleInfo" - Order_UpdateOrderDeliverStatus_FullMethodName = "/order.order/UpdateOrderDeliverStatus" - Order_GetOrderInfo_FullMethodName = "/order.order/GetOrderInfo" - Order_UpdateOrderPayStatus_FullMethodName = "/order.order/UpdateOrderPayStatus" ) // OrderClient is the client API for Order service. @@ -48,6 +52,24 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type OrderClient interface { Items(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*Response, error) + AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) + AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) + OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) + OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) + OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) + OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) + OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + SupplyItems(ctx context.Context, in *SupplyItemsRequest, opts ...grpc.CallOption) (*Response, error) + SupplyStatus(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) + UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) + UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) + // type 1为销售 2为门店 3为个人 + GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) + // status 1 为已支付 4 支付失败,其它的返回错误 + UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) + // ****************API********************* + ApiSupply(ctx context.Context, in *ApiSupplyRequest, opts ...grpc.CallOption) (*Response, error) + ApiSupplyInfo(ctx context.Context, in *ApiSupplyInfoRequest, opts ...grpc.CallOption) (*Response, error) WebCreate(ctx context.Context, in *CreateOrderRequest, opts ...grpc.CallOption) (*Response, error) WebCreateOne(ctx context.Context, in *CreateOrderOneRequest, opts ...grpc.CallOption) (*Response, error) WebAddressCreate(ctx context.Context, in *EditAddressRequest, opts ...grpc.CallOption) (*Response, error) @@ -58,19 +80,6 @@ type OrderClient interface { WebAddressItems(ctx context.Context, in *TypeRequest, opts ...grpc.CallOption) (*Response, error) WebCart(ctx context.Context, in *CartRequest, opts ...grpc.CallOption) (*Response, error) WebCartEdit(ctx context.Context, in *EditCartRequest, opts ...grpc.CallOption) (*Response, error) - AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) - AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) - OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) - OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) - OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) - OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) - OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) - UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) - UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) - // type 1为销售 2为门店 3为个人 - GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) - // status 1 为已支付 4 支付失败,其它的返回错误 - UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) } type orderClient struct { @@ -91,6 +100,156 @@ func (c *orderClient) Items(ctx context.Context, in *OrderItemsRequest, opts ... return out, nil } +func (c *orderClient) AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_AddressItem_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_AddressByStore_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_OrderAuditingItems_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_OrderAuditing_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_OrderCreate_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ExcelExportResponse) + err := c.cc.Invoke(ctx, Order_OrderDown_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_OrderInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) SupplyItems(ctx context.Context, in *SupplyItemsRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_SupplyItems_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) SupplyStatus(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_SupplyStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(UpdateAddressSaleInfoResponse) + err := c.cc.Invoke(ctx, Order_UpdateAddressSaleInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(UpdateOrderDeliverStatusResponse) + err := c.cc.Invoke(ctx, Order_UpdateOrderDeliverStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(OrderInfoResponse) + err := c.cc.Invoke(ctx, Order_GetOrderInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(UpdateOrderPayStatusResponse) + err := c.cc.Invoke(ctx, Order_UpdateOrderPayStatus_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) ApiSupply(ctx context.Context, in *ApiSupplyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_ApiSupply_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *orderClient) ApiSupplyInfo(ctx context.Context, in *ApiSupplyInfoRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Order_ApiSupplyInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *orderClient) WebCreate(ctx context.Context, in *CreateOrderRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -191,121 +350,29 @@ func (c *orderClient) WebCartEdit(ctx context.Context, in *EditCartRequest, opts return out, nil } -func (c *orderClient) AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Order_AddressItem_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Order_AddressByStore_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Order_OrderAuditingItems_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Order_OrderAuditing_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Order_OrderCreate_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(ExcelExportResponse) - err := c.cc.Invoke(ctx, Order_OrderDown_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Order_OrderInfo_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(UpdateAddressSaleInfoResponse) - err := c.cc.Invoke(ctx, Order_UpdateAddressSaleInfo_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(UpdateOrderDeliverStatusResponse) - err := c.cc.Invoke(ctx, Order_UpdateOrderDeliverStatus_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(OrderInfoResponse) - err := c.cc.Invoke(ctx, Order_GetOrderInfo_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *orderClient) UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(UpdateOrderPayStatusResponse) - err := c.cc.Invoke(ctx, Order_UpdateOrderPayStatus_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - // OrderServer is the server API for Order service. // All implementations must embed UnimplementedOrderServer // for forward compatibility. type OrderServer interface { Items(context.Context, *OrderItemsRequest) (*Response, error) + AddressItem(context.Context, *AddressItemsRequest) (*Response, error) + AddressByStore(context.Context, *AddressByStoreItemsRequest) (*Response, error) + OrderAuditingItems(context.Context, *OrderAuditingItemsRequest) (*Response, error) + OrderAuditing(context.Context, *OrderAuditingRequest) (*Response, error) + OrderCreate(context.Context, *AdminCreateOrderRequest) (*Response, error) + OrderDown(context.Context, *OrderItemsRequest) (*ExcelExportResponse, error) + OrderInfo(context.Context, *IdRequest) (*Response, error) + SupplyItems(context.Context, *SupplyItemsRequest) (*Response, error) + SupplyStatus(context.Context, *StatusRequest) (*Response, error) + UpdateAddressSaleInfo(context.Context, *UpdateAddressSaleInfoRequest) (*UpdateAddressSaleInfoResponse, error) + UpdateOrderDeliverStatus(context.Context, *UpdateOrderDeliverStatusRequest) (*UpdateOrderDeliverStatusResponse, error) + // type 1为销售 2为门店 3为个人 + GetOrderInfo(context.Context, *GetOrderInfoRequest) (*OrderInfoResponse, error) + // status 1 为已支付 4 支付失败,其它的返回错误 + UpdateOrderPayStatus(context.Context, *UpdateOrderPayStatusRequest) (*UpdateOrderPayStatusResponse, error) + // ****************API********************* + ApiSupply(context.Context, *ApiSupplyRequest) (*Response, error) + ApiSupplyInfo(context.Context, *ApiSupplyInfoRequest) (*Response, error) WebCreate(context.Context, *CreateOrderRequest) (*Response, error) WebCreateOne(context.Context, *CreateOrderOneRequest) (*Response, error) WebAddressCreate(context.Context, *EditAddressRequest) (*Response, error) @@ -316,19 +383,6 @@ type OrderServer interface { WebAddressItems(context.Context, *TypeRequest) (*Response, error) WebCart(context.Context, *CartRequest) (*Response, error) WebCartEdit(context.Context, *EditCartRequest) (*Response, error) - AddressItem(context.Context, *AddressItemsRequest) (*Response, error) - AddressByStore(context.Context, *AddressByStoreItemsRequest) (*Response, error) - OrderAuditingItems(context.Context, *OrderAuditingItemsRequest) (*Response, error) - OrderAuditing(context.Context, *OrderAuditingRequest) (*Response, error) - OrderCreate(context.Context, *AdminCreateOrderRequest) (*Response, error) - OrderDown(context.Context, *OrderItemsRequest) (*ExcelExportResponse, error) - OrderInfo(context.Context, *IdRequest) (*Response, error) - UpdateAddressSaleInfo(context.Context, *UpdateAddressSaleInfoRequest) (*UpdateAddressSaleInfoResponse, error) - UpdateOrderDeliverStatus(context.Context, *UpdateOrderDeliverStatusRequest) (*UpdateOrderDeliverStatusResponse, error) - // type 1为销售 2为门店 3为个人 - GetOrderInfo(context.Context, *GetOrderInfoRequest) (*OrderInfoResponse, error) - // status 1 为已支付 4 支付失败,其它的返回错误 - UpdateOrderPayStatus(context.Context, *UpdateOrderPayStatusRequest) (*UpdateOrderPayStatusResponse, error) mustEmbedUnimplementedOrderServer() } @@ -342,6 +396,51 @@ type UnimplementedOrderServer struct{} func (UnimplementedOrderServer) Items(context.Context, *OrderItemsRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method Items not implemented") } +func (UnimplementedOrderServer) AddressItem(context.Context, *AddressItemsRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method AddressItem not implemented") +} +func (UnimplementedOrderServer) AddressByStore(context.Context, *AddressByStoreItemsRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method AddressByStore not implemented") +} +func (UnimplementedOrderServer) OrderAuditingItems(context.Context, *OrderAuditingItemsRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method OrderAuditingItems not implemented") +} +func (UnimplementedOrderServer) OrderAuditing(context.Context, *OrderAuditingRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method OrderAuditing not implemented") +} +func (UnimplementedOrderServer) OrderCreate(context.Context, *AdminCreateOrderRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method OrderCreate not implemented") +} +func (UnimplementedOrderServer) OrderDown(context.Context, *OrderItemsRequest) (*ExcelExportResponse, error) { + return nil, status.Error(codes.Unimplemented, "method OrderDown not implemented") +} +func (UnimplementedOrderServer) OrderInfo(context.Context, *IdRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method OrderInfo not implemented") +} +func (UnimplementedOrderServer) SupplyItems(context.Context, *SupplyItemsRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method SupplyItems not implemented") +} +func (UnimplementedOrderServer) SupplyStatus(context.Context, *StatusRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method SupplyStatus not implemented") +} +func (UnimplementedOrderServer) UpdateAddressSaleInfo(context.Context, *UpdateAddressSaleInfoRequest) (*UpdateAddressSaleInfoResponse, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateAddressSaleInfo not implemented") +} +func (UnimplementedOrderServer) UpdateOrderDeliverStatus(context.Context, *UpdateOrderDeliverStatusRequest) (*UpdateOrderDeliverStatusResponse, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateOrderDeliverStatus not implemented") +} +func (UnimplementedOrderServer) GetOrderInfo(context.Context, *GetOrderInfoRequest) (*OrderInfoResponse, error) { + return nil, status.Error(codes.Unimplemented, "method GetOrderInfo not implemented") +} +func (UnimplementedOrderServer) UpdateOrderPayStatus(context.Context, *UpdateOrderPayStatusRequest) (*UpdateOrderPayStatusResponse, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateOrderPayStatus not implemented") +} +func (UnimplementedOrderServer) ApiSupply(context.Context, *ApiSupplyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiSupply not implemented") +} +func (UnimplementedOrderServer) ApiSupplyInfo(context.Context, *ApiSupplyInfoRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiSupplyInfo not implemented") +} func (UnimplementedOrderServer) WebCreate(context.Context, *CreateOrderRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method WebCreate not implemented") } @@ -372,39 +471,6 @@ func (UnimplementedOrderServer) WebCart(context.Context, *CartRequest) (*Respons func (UnimplementedOrderServer) WebCartEdit(context.Context, *EditCartRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method WebCartEdit not implemented") } -func (UnimplementedOrderServer) AddressItem(context.Context, *AddressItemsRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method AddressItem not implemented") -} -func (UnimplementedOrderServer) AddressByStore(context.Context, *AddressByStoreItemsRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method AddressByStore not implemented") -} -func (UnimplementedOrderServer) OrderAuditingItems(context.Context, *OrderAuditingItemsRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method OrderAuditingItems not implemented") -} -func (UnimplementedOrderServer) OrderAuditing(context.Context, *OrderAuditingRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method OrderAuditing not implemented") -} -func (UnimplementedOrderServer) OrderCreate(context.Context, *AdminCreateOrderRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method OrderCreate not implemented") -} -func (UnimplementedOrderServer) OrderDown(context.Context, *OrderItemsRequest) (*ExcelExportResponse, error) { - return nil, status.Error(codes.Unimplemented, "method OrderDown not implemented") -} -func (UnimplementedOrderServer) OrderInfo(context.Context, *IdRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method OrderInfo not implemented") -} -func (UnimplementedOrderServer) UpdateAddressSaleInfo(context.Context, *UpdateAddressSaleInfoRequest) (*UpdateAddressSaleInfoResponse, error) { - return nil, status.Error(codes.Unimplemented, "method UpdateAddressSaleInfo not implemented") -} -func (UnimplementedOrderServer) UpdateOrderDeliverStatus(context.Context, *UpdateOrderDeliverStatusRequest) (*UpdateOrderDeliverStatusResponse, error) { - return nil, status.Error(codes.Unimplemented, "method UpdateOrderDeliverStatus not implemented") -} -func (UnimplementedOrderServer) GetOrderInfo(context.Context, *GetOrderInfoRequest) (*OrderInfoResponse, error) { - return nil, status.Error(codes.Unimplemented, "method GetOrderInfo not implemented") -} -func (UnimplementedOrderServer) UpdateOrderPayStatus(context.Context, *UpdateOrderPayStatusRequest) (*UpdateOrderPayStatusResponse, error) { - return nil, status.Error(codes.Unimplemented, "method UpdateOrderPayStatus not implemented") -} func (UnimplementedOrderServer) mustEmbedUnimplementedOrderServer() {} func (UnimplementedOrderServer) testEmbeddedByValue() {} @@ -444,6 +510,276 @@ func _Order_Items_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _Order_AddressItem_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AddressItemsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).AddressItem(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_AddressItem_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).AddressItem(ctx, req.(*AddressItemsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_AddressByStore_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AddressByStoreItemsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).AddressByStore(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_AddressByStore_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).AddressByStore(ctx, req.(*AddressByStoreItemsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_OrderAuditingItems_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(OrderAuditingItemsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).OrderAuditingItems(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_OrderAuditingItems_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).OrderAuditingItems(ctx, req.(*OrderAuditingItemsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_OrderAuditing_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(OrderAuditingRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).OrderAuditing(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_OrderAuditing_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).OrderAuditing(ctx, req.(*OrderAuditingRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_OrderCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AdminCreateOrderRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).OrderCreate(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_OrderCreate_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).OrderCreate(ctx, req.(*AdminCreateOrderRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_OrderDown_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(OrderItemsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).OrderDown(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_OrderDown_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).OrderDown(ctx, req.(*OrderItemsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_OrderInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).OrderInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_OrderInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).OrderInfo(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_SupplyItems_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SupplyItemsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).SupplyItems(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_SupplyItems_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).SupplyItems(ctx, req.(*SupplyItemsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_SupplyStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(StatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).SupplyStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_SupplyStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).SupplyStatus(ctx, req.(*StatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_UpdateAddressSaleInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateAddressSaleInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).UpdateAddressSaleInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_UpdateAddressSaleInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).UpdateAddressSaleInfo(ctx, req.(*UpdateAddressSaleInfoRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_UpdateOrderDeliverStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateOrderDeliverStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).UpdateOrderDeliverStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_UpdateOrderDeliverStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).UpdateOrderDeliverStatus(ctx, req.(*UpdateOrderDeliverStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_GetOrderInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetOrderInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).GetOrderInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_GetOrderInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).GetOrderInfo(ctx, req.(*GetOrderInfoRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_UpdateOrderPayStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateOrderPayStatusRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).UpdateOrderPayStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_UpdateOrderPayStatus_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).UpdateOrderPayStatus(ctx, req.(*UpdateOrderPayStatusRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_ApiSupply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiSupplyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).ApiSupply(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_ApiSupply_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).ApiSupply(ctx, req.(*ApiSupplyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Order_ApiSupplyInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiSupplyInfoRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrderServer).ApiSupplyInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Order_ApiSupplyInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrderServer).ApiSupplyInfo(ctx, req.(*ApiSupplyInfoRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Order_WebCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(CreateOrderRequest) if err := dec(in); err != nil { @@ -624,204 +960,6 @@ func _Order_WebCartEdit_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } -func _Order_AddressItem_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AddressItemsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).AddressItem(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_AddressItem_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).AddressItem(ctx, req.(*AddressItemsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_AddressByStore_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AddressByStoreItemsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).AddressByStore(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_AddressByStore_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).AddressByStore(ctx, req.(*AddressByStoreItemsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_OrderAuditingItems_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OrderAuditingItemsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).OrderAuditingItems(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_OrderAuditingItems_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).OrderAuditingItems(ctx, req.(*OrderAuditingItemsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_OrderAuditing_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OrderAuditingRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).OrderAuditing(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_OrderAuditing_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).OrderAuditing(ctx, req.(*OrderAuditingRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_OrderCreate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AdminCreateOrderRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).OrderCreate(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_OrderCreate_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).OrderCreate(ctx, req.(*AdminCreateOrderRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_OrderDown_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OrderItemsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).OrderDown(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_OrderDown_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).OrderDown(ctx, req.(*OrderItemsRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_OrderInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(IdRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).OrderInfo(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_OrderInfo_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).OrderInfo(ctx, req.(*IdRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_UpdateAddressSaleInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateAddressSaleInfoRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).UpdateAddressSaleInfo(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_UpdateAddressSaleInfo_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).UpdateAddressSaleInfo(ctx, req.(*UpdateAddressSaleInfoRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_UpdateOrderDeliverStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateOrderDeliverStatusRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).UpdateOrderDeliverStatus(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_UpdateOrderDeliverStatus_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).UpdateOrderDeliverStatus(ctx, req.(*UpdateOrderDeliverStatusRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_GetOrderInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetOrderInfoRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).GetOrderInfo(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_GetOrderInfo_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).GetOrderInfo(ctx, req.(*GetOrderInfoRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Order_UpdateOrderPayStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateOrderPayStatusRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(OrderServer).UpdateOrderPayStatus(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Order_UpdateOrderPayStatus_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OrderServer).UpdateOrderPayStatus(ctx, req.(*UpdateOrderPayStatusRequest)) - } - return interceptor(ctx, in, info, handler) -} - // Order_ServiceDesc is the grpc.ServiceDesc for Order service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -833,6 +971,66 @@ var Order_ServiceDesc = grpc.ServiceDesc{ MethodName: "Items", Handler: _Order_Items_Handler, }, + { + MethodName: "AddressItem", + Handler: _Order_AddressItem_Handler, + }, + { + MethodName: "AddressByStore", + Handler: _Order_AddressByStore_Handler, + }, + { + MethodName: "OrderAuditingItems", + Handler: _Order_OrderAuditingItems_Handler, + }, + { + MethodName: "OrderAuditing", + Handler: _Order_OrderAuditing_Handler, + }, + { + MethodName: "OrderCreate", + Handler: _Order_OrderCreate_Handler, + }, + { + MethodName: "OrderDown", + Handler: _Order_OrderDown_Handler, + }, + { + MethodName: "OrderInfo", + Handler: _Order_OrderInfo_Handler, + }, + { + MethodName: "SupplyItems", + Handler: _Order_SupplyItems_Handler, + }, + { + MethodName: "SupplyStatus", + Handler: _Order_SupplyStatus_Handler, + }, + { + MethodName: "UpdateAddressSaleInfo", + Handler: _Order_UpdateAddressSaleInfo_Handler, + }, + { + MethodName: "UpdateOrderDeliverStatus", + Handler: _Order_UpdateOrderDeliverStatus_Handler, + }, + { + MethodName: "GetOrderInfo", + Handler: _Order_GetOrderInfo_Handler, + }, + { + MethodName: "UpdateOrderPayStatus", + Handler: _Order_UpdateOrderPayStatus_Handler, + }, + { + MethodName: "ApiSupply", + Handler: _Order_ApiSupply_Handler, + }, + { + MethodName: "ApiSupplyInfo", + Handler: _Order_ApiSupplyInfo_Handler, + }, { MethodName: "WebCreate", Handler: _Order_WebCreate_Handler, @@ -873,50 +1071,6 @@ var Order_ServiceDesc = grpc.ServiceDesc{ MethodName: "WebCartEdit", Handler: _Order_WebCartEdit_Handler, }, - { - MethodName: "AddressItem", - Handler: _Order_AddressItem_Handler, - }, - { - MethodName: "AddressByStore", - Handler: _Order_AddressByStore_Handler, - }, - { - MethodName: "OrderAuditingItems", - Handler: _Order_OrderAuditingItems_Handler, - }, - { - MethodName: "OrderAuditing", - Handler: _Order_OrderAuditing_Handler, - }, - { - MethodName: "OrderCreate", - Handler: _Order_OrderCreate_Handler, - }, - { - MethodName: "OrderDown", - Handler: _Order_OrderDown_Handler, - }, - { - MethodName: "OrderInfo", - Handler: _Order_OrderInfo_Handler, - }, - { - MethodName: "UpdateAddressSaleInfo", - Handler: _Order_UpdateAddressSaleInfo_Handler, - }, - { - MethodName: "UpdateOrderDeliverStatus", - Handler: _Order_UpdateOrderDeliverStatus_Handler, - }, - { - MethodName: "GetOrderInfo", - Handler: _Order_GetOrderInfo_Handler, - }, - { - MethodName: "UpdateOrderPayStatus", - Handler: _Order_UpdateOrderPayStatus_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "order/order.proto", diff --git a/services/equipment/internal/dao/bind.go b/services/equipment/internal/dao/bind.go index 01ceac3..0e3d9c8 100644 --- a/services/equipment/internal/dao/bind.go +++ b/services/equipment/internal/dao/bind.go @@ -27,7 +27,7 @@ type BindInfo struct { ExpiryTime string `gorm:"column:expiry_time;type:char(11);comment:过期时间" json:"expiry_time"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用" json:"status"` BindTime utils.CustomTime `gorm:"column:bind_time;type:datetime;comment:绑定时间" json:"bind_time"` - UpdatedAt utils.CustomTime `gorm:"column:updated_at;type:timestamp;default:CURRENT_TIMESTAMP;NOT NULL" json:"updated_at"` + UpdatedTime utils.CustomTime `gorm:"column:updated_time;type:timestamp;default:CURRENT_TIMESTAMP;NOT NULL" json:"updated_time"` } type BindExpiry struct { diff --git a/services/express/expressclient/express.go b/services/express/expressclient/express.go index 7630e0b..89c9eba 100644 --- a/services/express/expressclient/express.go +++ b/services/express/expressclient/express.go @@ -17,6 +17,7 @@ type ( CreateRequest = express.CreateRequest DeliverOrderProductInfo = express.DeliverOrderProductInfo DeliveringRequest = express.DeliveringRequest + DeliveryInfoResponse = express.DeliveryInfoResponse DeliveryOrderCreateRequest = express.DeliveryOrderCreateRequest EmtpyRequest = express.EmtpyRequest ExpressCompanyRequest = express.ExpressCompanyRequest @@ -51,6 +52,8 @@ type ( ExpressAdminCancel(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) // 添加生成订单的发货信息 DeliveryOrderCreate(ctx context.Context, in *DeliveryOrderCreateRequest, opts ...grpc.CallOption) (*IdResponse, error) + GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) + GetDeliveryBySupplyId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) } defaultExpress struct { @@ -156,3 +159,13 @@ func (m *defaultExpress) DeliveryOrderCreate(ctx context.Context, in *DeliveryOr client := express.NewExpressClient(m.cli.Conn()) return client.DeliveryOrderCreate(ctx, in, opts...) } + +func (m *defaultExpress) GetDeliveryByOrderId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.GetDeliveryByOrderId(ctx, in, opts...) +} + +func (m *defaultExpress) GetDeliveryBySupplyId(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*DeliveryInfoResponse, error) { + client := express.NewExpressClient(m.cli.Conn()) + return client.GetDeliveryBySupplyId(ctx, in, opts...) +} diff --git a/services/express/internal/dao/deliveryOrder.go b/services/express/internal/dao/deliveryOrder.go index e08ee6d..f709ad3 100644 --- a/services/express/internal/dao/deliveryOrder.go +++ b/services/express/internal/dao/deliveryOrder.go @@ -108,6 +108,8 @@ type DeliveryOrderPrintEdit struct { TransitContent string `gorm:"column:transit_content;type:text;comment:发快递时的结果" json:"transit_content"` TransitType uint8 `gorm:"column:transit_type;type:tinyint(1);default:1;comment:快递公司，1为顺丰，2为京东，3为。。。" json:"transit_type"` TransitId int `gorm:"column:transit_id;type:int(11);comment:快递表ID" json:"transit_id"` + EstimatedTime string `gorm:"column:estimated_time;type:varchar(30);comment:预计到达时间" json:"estimated_time"` + TransitQuery string `gorm:"column:transit_query;type:text;comment:查询快递信息" json:"transit_query"` PrintStatus uint8 `gorm:"column:print_status;type:tinyint(1);default:2;comment:打印状态，1为打印完，2为未打印，3为已绑定" json:"print_status"` Express string `gorm:"column:express;type:varchar(255);comment:快递单地址" json:"express"` Type uint8 `gorm:"column:type;type:tinyint(1);default:1;comment:类型，1为订单，2为试用，3为补货,4为个人家里试用，5产品先付后用;NOT NULL" json:"type"` diff --git a/services/express/internal/logic/getDeliveryByOrderIdLogic.go b/services/express/internal/logic/getDeliveryByOrderIdLogic.go new file mode 100644 index 0000000..fd9d0cb --- /dev/null +++ b/services/express/internal/logic/getDeliveryByOrderIdLogic.go @@ -0,0 +1,55 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/express/internal/dao" + "lone-services/services/express/internal/model" + "strconv" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +type GetDeliveryByOrderIdLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewGetDeliveryByOrderIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDeliveryByOrderIdLogic { + return &GetDeliveryByOrderIdLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *GetDeliveryByOrderIdLogic) GetDeliveryByOrderId(in *express.IdRequest) (*express.DeliveryInfoResponse, error) { + modelObj := model.DeliveryOrderModel{}.Init() + var info dao.DeliveryOrderPrintEdit + w := modelbase.Params{Eq: map[string]string{ + "type": strconv.Itoa(dao.DeliveryTypeOrder), + "obj_id": strconv.FormatInt(in.Id, utils.NumberTen)}} + err := modelObj.GetOne(w, &info) + if err != nil { + return nil, status.Error(codes.Internal, utils.Fail.Msg) + } + if info.Id < utils.NumberOne { + return nil, status.Error(codes.Internal, utils.ErrorNotFund.Msg) + } + + return &express.DeliveryInfoResponse{ + TransitName: info.TransitName, + TransitSn: info.TransitSn, + EstimatedTime: info.EstimatedTime, + TransitQuery: info.TransitQuery, + Status: int32(info.Status), + Id: int64(info.Id), + }, nil +} diff --git a/services/express/internal/logic/getDeliveryBySupplyIdLogic.go b/services/express/internal/logic/getDeliveryBySupplyIdLogic.go new file mode 100644 index 0000000..42116f9 --- /dev/null +++ b/services/express/internal/logic/getDeliveryBySupplyIdLogic.go @@ -0,0 +1,55 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/express/internal/dao" + "lone-services/services/express/internal/model" + "strconv" + + "lone-services/rpc/express/pb" + "lone-services/services/express/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +type GetDeliveryBySupplyIdLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewGetDeliveryBySupplyIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDeliveryBySupplyIdLogic { + return &GetDeliveryBySupplyIdLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *GetDeliveryBySupplyIdLogic) GetDeliveryBySupplyId(in *express.IdRequest) (*express.DeliveryInfoResponse, error) { + modelObj := model.DeliveryOrderModel{}.Init() + var info dao.DeliveryOrderPrintEdit + w := modelbase.Params{Eq: map[string]string{ + "type": strconv.Itoa(dao.DeliveryTypeSupply), + "obj_id": strconv.FormatInt(in.Id, utils.NumberTen)}} + err := modelObj.GetOne(w, &info) + if err != nil { + return nil, status.Error(codes.Internal, utils.Fail.Msg) + } + if info.Id < utils.NumberOne { + return nil, status.Error(codes.Internal, utils.ErrorNotFund.Msg) + } + + return &express.DeliveryInfoResponse{ + TransitName: info.TransitName, + TransitSn: info.TransitSn, + EstimatedTime: info.EstimatedTime, + TransitQuery: info.TransitQuery, + Status: int32(info.Status), + Id: int64(info.Id), + }, nil +} diff --git a/services/express/internal/server/expressServer.go b/services/express/internal/server/expressServer.go index d5ef5b5..cc9a331 100644 --- a/services/express/internal/server/expressServer.go +++ b/services/express/internal/server/expressServer.go @@ -115,3 +115,13 @@ func (s *ExpressServer) DeliveryOrderCreate(ctx context.Context, in *express.Del l := logic.NewDeliveryOrderCreateLogic(ctx, s.svcCtx) return l.DeliveryOrderCreate(in) } + +func (s *ExpressServer) GetDeliveryByOrderId(ctx context.Context, in *express.IdRequest) (*express.DeliveryInfoResponse, error) { + l := logic.NewGetDeliveryByOrderIdLogic(ctx, s.svcCtx) + return l.GetDeliveryByOrderId(in) +} + +func (s *ExpressServer) GetDeliveryBySupplyId(ctx context.Context, in *express.IdRequest) (*express.DeliveryInfoResponse, error) { + l := logic.NewGetDeliveryBySupplyIdLogic(ctx, s.svcCtx) + return l.GetDeliveryBySupplyId(in) +} diff --git a/services/order/internal/dao/order.go b/services/order/internal/dao/order.go index 8637e94..ecd0c3c 100644 --- a/services/order/internal/dao/order.go +++ b/services/order/internal/dao/order.go @@ -40,6 +40,12 @@ const ( TypeStore = 2 //门店 TypeAgentCompany = 3 //公司代理 TypeAgentPerson = 4 //公司代理 + + SupplyNo = 1 + SupplyYes = 2 + + OrderTypeOrder = 1 + OrderTypeSupply = 2 ) type OrderCreate struct { @@ -278,3 +284,8 @@ type UpPayStatus struct { VerifyStatus uint8 `gorm:"column:verify_status;type:tinyint(1);default:0;comment:审核状态，1为通过，2为失败，3为待审核，0为正常订单不需要审核" json:"verify_status"` ProductIds string `gorm:"column:product_ids;type:varchar(150);comment:产品IDs" json:"product_ids"` } + +type UpdateOrderSupply struct { + Id int64 `json:"id" gorm:"id"` + IsSupply int32 `json:"is_supply" gorm:"is_supply"` // 是否补货，1为是，0为否 +} diff --git a/services/order/internal/dao/orderProduct.go b/services/order/internal/dao/orderProduct.go index 639fb1a..1558653 100644 --- a/services/order/internal/dao/orderProduct.go +++ b/services/order/internal/dao/orderProduct.go @@ -7,6 +7,8 @@ type OrderProductCreate struct { OrderSn string `gorm:"column:order_sn;type:varchar(100);comment:订单号;NOT NULL" json:"order_sn"` ProductId int `gorm:"column:product_id;type:int(11);comment:产品ID;NOT NULL" json:"product_id"` ProductName string `gorm:"column:product_name;type:varchar(255);comment:产品名;NOT NULL" json:"product_name"` + Images string `json:"images" gorm:"images"` + Content string `json:"content" gorm:"content"` Price float64 `gorm:"column:price;type:decimal(10,2);comment:产品单价格;NOT NULL" json:"price"` Number int `gorm:"column:number;type:int(11);default:0;comment:购买的数量;NOT NULL" json:"number"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态：1为正常，2为已推货" json:"status"` @@ -19,6 +21,8 @@ type OrderProductInfo struct { ProductId int64 `gorm:"column:product_id;type:int(11);comment:产品ID;NOT NULL" json:"product_id"` ProductName string `gorm:"column:product_name;type:varchar(255);comment:产品名;NOT NULL" json:"product_name"` Price float64 `gorm:"column:price;type:decimal(10,2);comment:产品单价格;NOT NULL" json:"price"` + Images string `json:"images" gorm:"images"` + Content string `json:"content" gorm:"content"` Number int `gorm:"column:number;type:int(11);default:0;comment:购买的数量;NOT NULL" json:"number"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态：1为正常，2为已推货" json:"status"` ReturnNumber int `gorm:"column:return_number;type:int(11);default:0;comment:退货数量" json:"return_number"` diff --git a/services/order/internal/dao/supply.go b/services/order/internal/dao/supply.go new file mode 100644 index 0000000..fa4436c --- /dev/null +++ b/services/order/internal/dao/supply.go @@ -0,0 +1,110 @@ +package dao + +const ( + SupplyStatusOk uint8 = 1 // 通过 + SupplyStatusReject uint8 = 2 // 驳回 + SupplyStatusFirstReview uint8 = 3 // 一审中 + SupplyStatusSecondReview uint8 = 4 // 二审中 +) + +type SupplyCreate struct { + Id int64 `gorm:"column:id;type:bigint(20);primary_key;AUTO_INCREMENT" json:"id"` + OrderSn string `gorm:"column:order_sn;type:varchar(100);comment:订单号;NOT NULL" json:"order_sn"` + GroupId int64 `json:"group_id" gorm:"group_id"` // 分组iD + SaleId int64 `json:"sale_id" gorm:"sale_id"` + Products string `gorm:"column:products;type:varchar(255);comment:产品信息" json:"products"` + Reason string `gorm:"column:reason;type:varchar(255);comment:理由" json:"reason"` + Status int32 `gorm:"column:status;type:tinyint(1);default:3;comment:状态，1为通过，2为驳回，3为审核中，4为二审中" json:"status"` + Images string `json:"images" gorm:"images"` // 图片 +} + +type SupplyInfo struct { + Id int64 `gorm:"column:id;type:bigint(20);primary_key;AUTO_INCREMENT" json:"id"` + OrderSn string `gorm:"column:order_sn;type:varchar(100);comment:订单号;NOT NULL" json:"order_sn"` + SaleId int64 `json:"sale_id" gorm:"sale_id"` + GroupId int64 `json:"group_id" gorm:"group_id"` // 分组iD + AdminId int64 `json:"admin_id" gorm:"admin_id"` + AdminName string `json:"admin_name" gorm:"admin_name"` + AdminSecondId int64 `json:"admin_second_id" gorm:"admin_second_id"` + AdminSecondName string `json:"admin_second_name" gorm:"admin_second_name"` + VerifyReason string `json:"verify_reason" gorm:"verify_reason"` + Products string `gorm:"column:products;type:varchar(255);comment:产品信息" json:"products"` + Reason string `gorm:"column:reason;type:varchar(255);comment:理由" json:"reason"` + Status int32 `gorm:"column:status;type:tinyint(1);default:3;comment:状态，1为通过，2为驳回，3为审核中，4为二审中" json:"status"` + SupplyOrderInfo + DeliveryInfo SupplyOrderDeliveryInfo `json:"delivery_info" gorm:"-"` +} + +type AdminSupplyInfo struct { + Id int64 `gorm:"column:id;type:bigint(20);primary_key;AUTO_INCREMENT" json:"id"` + OrderSn string `gorm:"column:order_sn;type:varchar(100);comment:订单号;NOT NULL" json:"order_sn"` + SaleId int64 `json:"sale_id" gorm:"sale_id"` + GroupId int64 `json:"group_id" gorm:"group_id"` // 分组iD + AdminId int64 `json:"admin_id" gorm:"admin_id"` + AdminName string `json:"admin_name" gorm:"admin_name"` + AdminSecondId int64 `json:"admin_second_id" gorm:"admin_second_id"` + AdminSecondName string `json:"admin_second_name" gorm:"admin_second_name"` + VerifyReason string `json:"verify_reason" gorm:"verify_reason"` + Products string `gorm:"column:products;type:varchar(255);comment:产品信息" json:"products"` + Reason string `gorm:"column:reason;type:varchar(255);comment:理由" json:"reason"` + Status int32 `gorm:"column:status;type:tinyint(1);default:3;comment:状态，1为通过，2为驳回，3为审核中，4为二审中" json:"status"` + SupplyOrderInfo +} + +type SupplyList struct { + Id int64 `json:"id"` + OrderSn string `gorm:"column:order_sn" json:"order_sn"` + Reason string `json:"reason"` + Status int32 `json:"status"` + Images string `json:"images"` +} + +type SupplyVerifyHistory struct { + OrderInfo + Id int64 `json:"id"` + OrderSn string `gorm:"column:order_sn" json:"order_sn"` + Status int32 `json:"status"` + Reason string `json:"reason"` + Images string `json:"images"` +} + +type SupplyVerifyUpdate struct { + Id int64 `gorm:"column:id;type:bigint(20);primary_key;AUTO_INCREMENT" json:"id"` + OrderSn string `gorm:"column:order_sn" json:"order_sn"` + Status int32 `json:"status"` + AdminId int64 `json:"admin_id" gorm:"admin_id"` + AdminName string `json:"admin_name" gorm:"admin_name"` + AdminSecondId int64 `json:"admin_second_id" gorm:"admin_second_id"` + AdminSecondName string `json:"admin_second_name" gorm:"admin_second_name"` + VerifyReason string `json:"verify_reason" gorm:"verify_reason"` +} + +type SupplyOrderInfo struct { + SaleName string `json:"sale_id" gorm:"-"` + StoreId int64 `json:"store_id" gorm:"-"` + StoreName string `json:"store_name" gorm:"-"` + SaleMobile string `json:"sale_mobile" gorm:"-"` + Mobile string `json:"mobile" gorm:"-"` + Address string `json:"address" gorm:"-"` + Addressee string `json:"addressee" gorm:"-"` + ProductInfo []SupplyOrderProduct `json:"product_info" gorm:"-"` + OrderStatus int32 `json:"order_status" gorm:"-"` +} + +type SupplyOrderDeliveryInfo struct { + TransitName string `json:"transit_name" gorm:"-"` + TransitSn string `json:"transit_sn" gorm:"-"` + EstimatedTime string `json:"estimated_time" gorm:"-"` + TransitQuery string `json:"transit_query" gorm:"-"` + Status int32 `json:"status" gorm:"-"` + Id int64 `json:"id" gorm:"-"` +} + +type SupplyOrderProduct struct { + Id int64 `json:"id" gorm:"-"` + Images []string `json:"images" gorm:"-"` + Name string `json:"name" gorm:"-"` + Price float64 `json:"price" gorm:"-"` + Number int `json:"number" gorm:"-"` + Content string `json:"content" gorm:"-"` +} diff --git a/services/order/internal/logic/apiSupplyInfoLogic.go b/services/order/internal/logic/apiSupplyInfoLogic.go new file mode 100644 index 0000000..98c62bc --- /dev/null +++ b/services/order/internal/logic/apiSupplyInfoLogic.go @@ -0,0 +1,129 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/order/internal/dao" + "lone-services/services/order/internal/model" + "lone-services/services/order/validator" + "strconv" + "strings" + + "lone-services/rpc/order/pb" + "lone-services/services/order/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiSupplyInfoLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiSupplyInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiSupplyInfoLogic { + return &ApiSupplyInfoLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiSupplyInfoLogic) ApiSupplyInfo(in *order.ApiSupplyInfoRequest) (*order.Response, error) { + var v validator.SupplyInfoValidator + 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) + } + + w := modelbase.Params{Eq: map[string]string{ + "sale_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen), + "order_sn": in.OrderSn, + }, + } + + var info dao.SupplyInfo + err := model.SupplyModel{}.Init().GetOne(w, &info) + if err != nil { + return l.fail(utils.Fail) + } + + l.getData(&info) + return l.ok(info) +} + +func (l *ApiSupplyInfoLogic) getData(info *dao.SupplyInfo) utils.Status { + + w := modelbase.Params{Eq: map[string]string{"order_sn": info.OrderSn}} + var orderInfo dao.OrderInfo + err := model.OrderModel{}.Init().GetOne(w, &orderInfo) + if err != nil { + return utils.Fail + } + + if orderInfo.Id < utils.NumberOne { + return utils.ErrorNotFund + } + + var orderProducts []dao.OrderProductInfo + err = model.OrderProductModel{}.Init().Items(w, &orderProducts) + if err != nil { + return utils.Fail + } + if len(orderProducts) < utils.NumberOne { + return utils.ErrorNotFund + } + + for _, item := range orderProducts { + info.ProductInfo = append(info.ProductInfo, dao.SupplyOrderProduct{ + Id: item.ProductId, + Name: item.ProductName, + Price: item.Price, + Number: item.Number, + Images: strings.Split(item.Images, utils.DecollatorComma), + Content: item.Content, + }) + } + + if orderInfo.SaleMobile != utils.StringEmpty { + saleMobile, sErr := utils.DecryptPhone(orderInfo.SaleMobile) + if sErr != nil { + return utils.Fail + } + info.SaleMobile = saleMobile + } + + if orderInfo.Mobile != utils.StringEmpty { + mobile, sErr := utils.DecryptPhone(orderInfo.Mobile) + if sErr != nil { + return utils.Fail + } + info.Mobile = mobile + } + info.SaleName = orderInfo.SaleName + info.StoreId = int64(orderInfo.StoreId) + info.StoreName = orderInfo.StoreName + info.Address = orderInfo.Address + info.Addressee = orderInfo.Addressee + info.OrderStatus = int32(orderInfo.Status) + if info.Status == int32(dao.SupplyStatusOk) { + deliveryInfo, dErr := svc.GetDeliveryInfo(l.svcCtx.ExpressSvcName, orderInfo.Id, dao.OrderTypeSupply) + if dErr != utils.Ok { + return dErr + } + info.DeliveryInfo = dao.SupplyOrderDeliveryInfo{ + TransitName: deliveryInfo.TransitName, + TransitSn: deliveryInfo.TransitSn, + EstimatedTime: deliveryInfo.EstimatedTime, + TransitQuery: deliveryInfo.TransitQuery, + Status: deliveryInfo.Status, + Id: deliveryInfo.Id, + } + } + return utils.Ok +} diff --git a/services/order/internal/logic/apiSupplyLogic.go b/services/order/internal/logic/apiSupplyLogic.go new file mode 100644 index 0000000..634282e --- /dev/null +++ b/services/order/internal/logic/apiSupplyLogic.go @@ -0,0 +1,130 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/order/internal/dao" + "lone-services/services/order/internal/model" + "lone-services/services/order/validator" + "strconv" + "strings" + + "lone-services/rpc/order/pb" + "lone-services/services/order/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ApiSupplyLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewApiSupplyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiSupplyLogic { + return &ApiSupplyLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ApiSupplyLogic) ApiSupply(in *order.ApiSupplyRequest) (*order.Response, error) { + var v validator.SupplyValidator + 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) + } + + w := modelbase.Params{Eq: map[string]string{ + "order_sn": in.OrderSn, + }} + + var supplyInfo dao.SupplyCreate + modelObj := model.SupplyModel{}.Init() + err := modelObj.GetOne(w, &supplyInfo) + if err != nil { + return l.fail(utils.ErrorSupplyOrderError) + } + var orderInfo dao.OrderCreate + ww := modelbase.Params{Eq: map[string]string{ + "order_sn": in.OrderSn, + "deliver_status": strconv.Itoa(dao.SendStatusOver), + }} + err = model.OrderModel{}.Init().GetOne(ww, &orderInfo) + if err != nil { + return l.fail(utils.ErrorNotFund) + } + if orderInfo.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + + check := l.checkProducts(in.Info, in.OrderSn) + if check != utils.Ok { + return l.fail(check) + } + + supplyInfo.OrderSn = in.OrderSn + supplyInfo.Products = in.Info + supplyInfo.GroupId = int64(orderInfo.GroupId) + supplyInfo.Reason = in.Reason + supplyInfo.SaleId = int64(orderInfo.SaleId) + supplyInfo.Images = strings.Join(in.Images, utils.DecollatorComma) + modelObj.Begin() + err = modelObj.Create(&supplyInfo) + if err != nil { + modelObj.Rollback() + return l.fail(utils.Fail) + } + + update := dao.UpdateOrderSupply{ + Id: orderInfo.Id, + IsSupply: dao.SupplyYes, + } + _, err = model.OrderModel{}.Init().Edit(ww, &update) + if err != nil { + modelObj.Rollback() + return l.fail(utils.Fail) + } + + modelObj.Commit() + + return l.ok(utils.NumberOne) +} + +func (l *ApiSupplyLogic) checkProducts(info, orderSn string) utils.Status { + w := modelbase.Params{Eq: map[string]string{ + "order_sn": orderSn, + }} + + var items []dao.OrderProductInfo + err := model.OrderProductModel{}.Init().Items(w, &items) + if err != nil { + return utils.Fail + } + orderProducts := make(map[int]int) + for _, item := range items { + orderProducts[int(item.ProductId)] = item.Number + } + + var products [][]int + ok := utils.JsonStringToStruct(info, &products) + if !ok { + return utils.Fail + } + for _, value := range products { + if _, o := orderProducts[value[0]]; !o { + return utils.ErrorSupplyOrderProduct + } + if orderProducts[value[0]] < value[1] { + return utils.ErrorSupplyOrderProduct + } + } + + return utils.Ok +} diff --git a/services/order/internal/logic/orderAuditingLogic.go b/services/order/internal/logic/orderAuditingLogic.go index 16571a3..04373fb 100644 --- a/services/order/internal/logic/orderAuditingLogic.go +++ b/services/order/internal/logic/orderAuditingLogic.go @@ -114,7 +114,7 @@ func (l *OrderAuditingLogic) getDeliveryInfo(info dao.OrderImitateInfo) (express Type: dao.DeliverTypeOrder, Status: dao.SendStatusWait, } - if info.DeliverType == dao.OrderDeliverTypeSend { + if info.DeliverType == dao.OrderDeliverTypeNotSend { deliverGoods.Status = dao.SendStatusOver } diff --git a/services/order/internal/logic/orderCreateLogic.go b/services/order/internal/logic/orderCreateLogic.go index d001ab8..83ade4a 100644 --- a/services/order/internal/logic/orderCreateLogic.go +++ b/services/order/internal/logic/orderCreateLogic.go @@ -104,6 +104,8 @@ func (l *OrderCreateLogic) OrderCreate(in *order.AdminCreateOrderRequest) (*orde OrderSn: data.OrderSn, ProductId: int(item.Id), ProductName: item.Name, + Images: strings.Join(item.Images, utils.DecollatorComma), + Content: item.Content, Price: utils.NumberZero, Number: int(buyNum), }) diff --git a/services/order/internal/logic/supplyItemsLogic.go b/services/order/internal/logic/supplyItemsLogic.go new file mode 100644 index 0000000..6977704 --- /dev/null +++ b/services/order/internal/logic/supplyItemsLogic.go @@ -0,0 +1,145 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/order/internal/dao" + "lone-services/services/order/internal/model" + "lone-services/services/order/validator" + "strconv" + "strings" + + "lone-services/rpc/order/pb" + "lone-services/services/order/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type SupplyItemsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewSupplyItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SupplyItemsLogic { + return &SupplyItemsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *SupplyItemsLogic) SupplyItems(in *order.SupplyItemsRequest) (*order.Response, error) { + var v validator.SupplyItemsValidator + 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) + } + + w := modelbase.Params{Eq: map[string]string{ + "sale_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen), + "status": string(in.Status), + }, + Order: "id desc", + Page: int(in.Page), + Size: int(in.Size), + } + + if in.Status > utils.NumberZero { + w.Eq["status"] = string(in.Status) + } + + w.Like = make(map[string]string) + if len(in.OrderSn) > utils.NumberZero { + w.Like["order_sn"] = in.OrderSn + } + + w.Other = make(map[string]string) + if len(in.Time) > utils.NumberZero { + w.Other["create_time > ?"] = in.Time[utils.NumberZero] + w.Other["create_time < ?"] = in.Time[utils.NumberOne] + } + + var info []dao.AdminSupplyInfo + items, err := model.SupplyModel{}.Init().Page(w, &info) + if err != nil { + return l.fail(utils.Fail) + } + + l.getData(&info) + items.Items = info + return l.ok(items) +} + +func (l *SupplyItemsLogic) getData(info *[]dao.AdminSupplyInfo) utils.Status { + var orderSns []string + for _, item := range *info { + orderSns = append(orderSns, item.OrderSn) + } + + w := modelbase.Params{In: map[string][]string{"order_sn": orderSns}} + var orders []dao.OrderInfo + err := model.OrderModel{}.Init().Items(w, &orders) + if err != nil { + return utils.Fail + } + + var orderProducts []dao.OrderProductInfo + err = model.OrderProductModel{}.Init().Items(w, &orderProducts) + if err != nil { + return utils.Fail + } + + productInfos := make(map[string][]dao.SupplyOrderProduct) + for _, item := range orderProducts { + productInfos[item.OrderSn] = append(productInfos[item.OrderSn], dao.SupplyOrderProduct{ + Id: item.ProductId, + Name: item.ProductName, + Price: utils.RoundFloat(item.Price), + Number: item.Number, + Images: strings.Split(item.Images, utils.DecollatorComma), + Content: item.Content, + }) + } + + l.Logger.Error(orders) + l.Logger.Error(orderProducts) + productIds := make(map[string]dao.SupplyOrderInfo) + for _, item := range orders { + tmp := dao.SupplyOrderInfo{ + SaleName: item.SaleName, + StoreId: int64(item.StoreId), + StoreName: item.StoreName, + SaleMobile: item.SaleMobile, + Mobile: item.Mobile, + Address: item.Address, + Addressee: item.Addressee, + OrderStatus: int32(item.Status), + } + if _, ok := productInfos[item.OrderSn]; ok { + tmp.ProductInfo = productInfos[item.OrderSn] + } + productIds[item.OrderSn] = tmp + } + + for key, item := range *info { + if _, ok := productIds[item.OrderSn]; !ok { + continue + } + (*info)[key].SaleName = productIds[item.OrderSn].SaleName + (*info)[key].StoreId = productIds[item.OrderSn].StoreId + (*info)[key].StoreName = productIds[item.OrderSn].StoreName + (*info)[key].SaleMobile = productIds[item.OrderSn].SaleMobile + (*info)[key].Mobile = productIds[item.OrderSn].Mobile + (*info)[key].Address = productIds[item.OrderSn].Address + (*info)[key].Addressee = productIds[item.OrderSn].Addressee + (*info)[key].OrderStatus = productIds[item.OrderSn].OrderStatus + (*info)[key].ProductInfo = productIds[item.OrderSn].ProductInfo + } + return utils.Ok +} diff --git a/services/order/internal/logic/supplyStatusLogic.go b/services/order/internal/logic/supplyStatusLogic.go new file mode 100644 index 0000000..cc6d668 --- /dev/null +++ b/services/order/internal/logic/supplyStatusLogic.go @@ -0,0 +1,217 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/pkg/validate" + chore "lone-services/rpc/chore/pb" + express "lone-services/rpc/express/pb" + "lone-services/rpc/order/pb" + product "lone-services/rpc/product/pb" + "lone-services/services/order/internal/dao" + "lone-services/services/order/internal/model" + "lone-services/services/order/internal/svc" + "strconv" + "strings" + + "github.com/zeromicro/go-zero/core/logx" +) + +type SupplyStatusLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewSupplyStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SupplyStatusLogic { + return &SupplyStatusLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *SupplyStatusLogic) SupplyStatus(in *order.StatusRequest) (*order.Response, error) { + var v validate.StatusValidator //status 2为拒绝 4为二审，1为通过 + 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) + } + + w := modelbase.Params{Eq: map[string]string{ + "id": strconv.FormatInt(in.Id, utils.NumberTen), + }, + } + + var info dao.SupplyVerifyUpdate + modelObj := model.SupplyModel{}.Init() + err := modelObj.GetOne(w, &info) + if err != nil { + return l.fail(utils.Fail) + } + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + switch info.Status { + case int32(dao.SupplyStatusSecondReview): + info.Status = int32(dao.SupplyStatusReject) + if in.Status == int32(dao.SupplyStatusOk) { + info.Status = int32(dao.SupplyStatusOk) + } + info.AdminSecondId = adminInfo.ID + info.AdminSecondName = adminInfo.Name + case int32(dao.SupplyStatusFirstReview): + info.Status = int32(dao.SupplyStatusReject) + if in.Status == int32(dao.SupplyStatusOk) { + info.Status = int32(dao.SupplyStatusSecondReview) + } + info.AdminId = adminInfo.ID + info.AdminName = adminInfo.Name + + default: + return l.fail(utils.ErrorNotFund) + } + + info.VerifyReason = in.Reason + + modelObj.Begin() + _, err = modelObj.Edit(w, &info) + if err != nil { + modelObj.Rollback() + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + deliverGoods, status := l.getDeliveryInfo(info) + if status != utils.Ok { + modelObj.Rollback() + return l.fail(status) + } + + sErr := l.createDelivery(deliverGoods) + if sErr != utils.Ok { + modelObj.Rollback() + return l.fail(sErr) + } + + modelObj.Commit() + + return l.ok(utils.NumberOne) +} + +func (l *SupplyStatusLogic) createDelivery(data express.DeliveryOrderCreateRequest) utils.Status { + cli, err := svc.GetRpcClient(l.svcCtx.ExpressSvcName) + if err != nil { + return utils.ErrorInternalServer + } + + client := express.NewExpressClient(cli.Conn()) + _, err = client.DeliveryOrderCreate(l.ctx, &data) + if err != nil { + logx.Errorf("set products err: %v", err) + return utils.ErrorInternalServer + } + return utils.Ok +} + +func (l *SupplyStatusLogic) getDeliveryInfo(info dao.SupplyVerifyUpdate) (express.DeliveryOrderCreateRequest, utils.Status) { + var orderInfo dao.OrderInfo + w := modelbase.Params{Eq: map[string]string{"order_sn": info.OrderSn}} + err := model.OrderModel{}.Init().GetOne(w, &orderInfo) + if err != nil { + logx.Errorf("get order err: %v", err) + return express.DeliveryOrderCreateRequest{}, utils.Fail + } + if orderInfo.Id < utils.NumberOne { + return express.DeliveryOrderCreateRequest{}, utils.ErrorNotFund + } + + deliverGoods := express.DeliveryOrderCreateRequest{ + ObjId: strconv.FormatInt(info.Id, utils.NumberTen), + Mobile: orderInfo.Mobile, + Address: orderInfo.Address, + Addressee: orderInfo.Addressee, + ObjSn: info.OrderSn, + Type: dao.DeliverTypeSupply, + Status: dao.SendStatusWait, + } + + w = modelbase.Params{Eq: map[string]string{"order_sn": info.OrderSn}} + var orderProducts []dao.OrderProductInfo + err = model.OrderProductModel{}.Init().Items(w, &orderProducts) + if err != nil || len(orderProducts) < utils.NumberOne { + logx.Errorf("get products err: %v", err) + return deliverGoods, utils.ErrorNotFund + } + var productIds []int64 + idsNumber := make(map[int64]int) + for _, item := range orderProducts { + productIds = append(productIds, item.ProductId) + idsNumber[item.ProductId] = item.Number + } + + cli, err := svc.GetRpcClient(l.svcCtx.ProductSvcName) + if err != nil { + logx.Errorf("get products err: %v", err) + return deliverGoods, utils.ErrorInternalServer + } + + productClient := product.NewProductClient(cli.Conn()) + productItems, err := productClient.ItemsByIds(l.ctx, &product.ItemsByIdsReq{Ids: productIds}) + if err != nil { + logx.Errorf("get products err: %v", err) + return deliverGoods, utils.ErrorInternalServer + } + + for _, item := range productItems.Items { + number := utils.NumberZero + if _, ok := idsNumber[item.Id]; ok { + number = idsNumber[item.Id] + } + deliverGoods.ProductInfo = append(deliverGoods.ProductInfo, &express.DeliverOrderProductInfo{ + ProductId: item.Id, + Number: int32(number), + Type: int32(item.Type), + ProductName: item.Name, + Price: item.Price, + }) + } + + clic, err := svc.GetRpcClient(l.svcCtx.ChoreSvcName) + if err != nil { + logx.Errorf("get region err: %v", err) + return deliverGoods, utils.ErrorInternalServer + } + + var regionIds []int64 + for _, item := range strings.Split(orderInfo.DistrictIds, utils.DecollatorComma) { + id, _ := strconv.Atoi(item) + regionIds = append(regionIds, int64(id)) + } + + clicClient := chore.NewChoreClient(clic.Conn()) + regionItems, err := clicClient.RegionsByIds(l.ctx, &chore.RegionsByIdsReq{Ids: regionIds}) + if err != nil { + logx.Errorf("get region err: %v", err) + return deliverGoods, utils.ErrorInternalServer + } + + switch len(regionItems.Items) { + case utils.NumberOne: + deliverGoods.Province = regionItems.Items[utils.NumberZero].Name + case utils.NumberTwo: + deliverGoods.Province = regionItems.Items[utils.NumberZero].Name + deliverGoods.City = regionItems.Items[utils.NumberOne].Name + case utils.NumberThree: + deliverGoods.Province = regionItems.Items[utils.NumberZero].Name + deliverGoods.City = regionItems.Items[utils.NumberOne].Name + deliverGoods.County = regionItems.Items[utils.NumberTwo].Name + } + + return deliverGoods, utils.Ok +} diff --git a/services/order/internal/logic/webCreateLogic.go b/services/order/internal/logic/webCreateLogic.go index fb2ea90..e8402ed 100644 --- a/services/order/internal/logic/webCreateLogic.go +++ b/services/order/internal/logic/webCreateLogic.go @@ -149,6 +149,8 @@ func (l *WebCreateLogic) WebCreate(in *order.CreateOrderRequest) (*order.Respons OrderSn: data.OrderSn, ProductId: int(item.Id), ProductName: item.Name, + Images: strings.Join(item.Images, utils.DecollatorComma), + Content: item.Content, Price: utils.RoundFloat(item.Price), Number: int(buyNum), }) diff --git a/services/order/internal/logic/webCreateOneLogic.go b/services/order/internal/logic/webCreateOneLogic.go index e64f395..93f0420 100644 --- a/services/order/internal/logic/webCreateOneLogic.go +++ b/services/order/internal/logic/webCreateOneLogic.go @@ -11,6 +11,7 @@ import ( "lone-services/services/order/internal/svc" "lone-services/services/order/validator" "strconv" + "strings" "github.com/zeromicro/go-zero/core/logx" ) @@ -115,6 +116,8 @@ func (l *WebCreateOneLogic) WebCreateOne(in *order.CreateOrderOneRequest) (*orde orderProduct := dao.OrderProductCreate{ OrderSn: data.OrderSn, + Images: strings.Join(productInfo.Images, utils.DecollatorComma), + Content: productInfo.Content, ProductId: int(in.ProductId), ProductName: productInfo.Name, Price: utils.RoundFloat(productInfo.Price), diff --git a/services/order/internal/model/supply.go b/services/order/internal/model/supply.go new file mode 100644 index 0000000..324fe3f --- /dev/null +++ b/services/order/internal/model/supply.go @@ -0,0 +1,23 @@ +package model + +import ( + "lone-services/pkg/modelbase" + "lone-services/services/order/internal/dao" +) + +type SupplyModel struct { + modelbase.Base +} + +func (m SupplyModel) TableName() string { + return modelbase.Prefix() + "supply" +} + +func (m SupplyModel) Init() SupplyModel { + m.Table = m.TableName() + return m +} + +func (m SupplyModel) Create(data *dao.SupplyCreate) error { + return m.Base.Create(data) +} diff --git a/services/order/internal/server/orderServer.go b/services/order/internal/server/orderServer.go index 0d52118..b5d0e4a 100644 --- a/services/order/internal/server/orderServer.go +++ b/services/order/internal/server/orderServer.go @@ -28,6 +28,84 @@ func (s *OrderServer) Items(ctx context.Context, in *order.OrderItemsRequest) (* return l.Items(in) } +func (s *OrderServer) AddressItem(ctx context.Context, in *order.AddressItemsRequest) (*order.Response, error) { + l := logic.NewAddressItemLogic(ctx, s.svcCtx) + return l.AddressItem(in) +} + +func (s *OrderServer) AddressByStore(ctx context.Context, in *order.AddressByStoreItemsRequest) (*order.Response, error) { + l := logic.NewAddressByStoreLogic(ctx, s.svcCtx) + return l.AddressByStore(in) +} + +func (s *OrderServer) OrderAuditingItems(ctx context.Context, in *order.OrderAuditingItemsRequest) (*order.Response, error) { + l := logic.NewOrderAuditingItemsLogic(ctx, s.svcCtx) + return l.OrderAuditingItems(in) +} + +func (s *OrderServer) OrderAuditing(ctx context.Context, in *order.OrderAuditingRequest) (*order.Response, error) { + l := logic.NewOrderAuditingLogic(ctx, s.svcCtx) + return l.OrderAuditing(in) +} + +func (s *OrderServer) OrderCreate(ctx context.Context, in *order.AdminCreateOrderRequest) (*order.Response, error) { + l := logic.NewOrderCreateLogic(ctx, s.svcCtx) + return l.OrderCreate(in) +} + +func (s *OrderServer) OrderDown(ctx context.Context, in *order.OrderItemsRequest) (*order.ExcelExportResponse, error) { + l := logic.NewOrderDownLogic(ctx, s.svcCtx) + return l.OrderDown(in) +} + +func (s *OrderServer) OrderInfo(ctx context.Context, in *order.IdRequest) (*order.Response, error) { + l := logic.NewOrderInfoLogic(ctx, s.svcCtx) + return l.OrderInfo(in) +} + +func (s *OrderServer) SupplyItems(ctx context.Context, in *order.SupplyItemsRequest) (*order.Response, error) { + l := logic.NewSupplyItemsLogic(ctx, s.svcCtx) + return l.SupplyItems(in) +} + +func (s *OrderServer) SupplyStatus(ctx context.Context, in *order.StatusRequest) (*order.Response, error) { + l := logic.NewSupplyStatusLogic(ctx, s.svcCtx) + return l.SupplyStatus(in) +} + +func (s *OrderServer) UpdateAddressSaleInfo(ctx context.Context, in *order.UpdateAddressSaleInfoRequest) (*order.UpdateAddressSaleInfoResponse, error) { + l := logic.NewUpdateAddressSaleInfoLogic(ctx, s.svcCtx) + return l.UpdateAddressSaleInfo(in) +} + +func (s *OrderServer) UpdateOrderDeliverStatus(ctx context.Context, in *order.UpdateOrderDeliverStatusRequest) (*order.UpdateOrderDeliverStatusResponse, error) { + l := logic.NewUpdateOrderDeliverStatusLogic(ctx, s.svcCtx) + return l.UpdateOrderDeliverStatus(in) +} + +// type 1为销售 2为门店 3为个人 +func (s *OrderServer) GetOrderInfo(ctx context.Context, in *order.GetOrderInfoRequest) (*order.OrderInfoResponse, error) { + l := logic.NewGetOrderInfoLogic(ctx, s.svcCtx) + return l.GetOrderInfo(in) +} + +// status 1 为已支付 4 支付失败,其它的返回错误 +func (s *OrderServer) UpdateOrderPayStatus(ctx context.Context, in *order.UpdateOrderPayStatusRequest) (*order.UpdateOrderPayStatusResponse, error) { + l := logic.NewUpdateOrderPayStatusLogic(ctx, s.svcCtx) + return l.UpdateOrderPayStatus(in) +} + +// API +func (s *OrderServer) ApiSupply(ctx context.Context, in *order.ApiSupplyRequest) (*order.Response, error) { + l := logic.NewApiSupplyLogic(ctx, s.svcCtx) + return l.ApiSupply(in) +} + +func (s *OrderServer) ApiSupplyInfo(ctx context.Context, in *order.ApiSupplyInfoRequest) (*order.Response, error) { + l := logic.NewApiSupplyInfoLogic(ctx, s.svcCtx) + return l.ApiSupplyInfo(in) +} + func (s *OrderServer) WebCreate(ctx context.Context, in *order.CreateOrderRequest) (*order.Response, error) { l := logic.NewWebCreateLogic(ctx, s.svcCtx) return l.WebCreate(in) @@ -77,60 +155,3 @@ func (s *OrderServer) WebCartEdit(ctx context.Context, in *order.EditCartRequest l := logic.NewWebCartEditLogic(ctx, s.svcCtx) return l.WebCartEdit(in) } - -func (s *OrderServer) AddressItem(ctx context.Context, in *order.AddressItemsRequest) (*order.Response, error) { - l := logic.NewAddressItemLogic(ctx, s.svcCtx) - return l.AddressItem(in) -} - -func (s *OrderServer) AddressByStore(ctx context.Context, in *order.AddressByStoreItemsRequest) (*order.Response, error) { - l := logic.NewAddressByStoreLogic(ctx, s.svcCtx) - return l.AddressByStore(in) -} - -func (s *OrderServer) OrderAuditingItems(ctx context.Context, in *order.OrderAuditingItemsRequest) (*order.Response, error) { - l := logic.NewOrderAuditingItemsLogic(ctx, s.svcCtx) - return l.OrderAuditingItems(in) -} - -func (s *OrderServer) OrderAuditing(ctx context.Context, in *order.OrderAuditingRequest) (*order.Response, error) { - l := logic.NewOrderAuditingLogic(ctx, s.svcCtx) - return l.OrderAuditing(in) -} - -func (s *OrderServer) OrderCreate(ctx context.Context, in *order.AdminCreateOrderRequest) (*order.Response, error) { - l := logic.NewOrderCreateLogic(ctx, s.svcCtx) - return l.OrderCreate(in) -} - -func (s *OrderServer) OrderDown(ctx context.Context, in *order.OrderItemsRequest) (*order.ExcelExportResponse, error) { - l := logic.NewOrderDownLogic(ctx, s.svcCtx) - return l.OrderDown(in) -} - -func (s *OrderServer) OrderInfo(ctx context.Context, in *order.IdRequest) (*order.Response, error) { - l := logic.NewOrderInfoLogic(ctx, s.svcCtx) - return l.OrderInfo(in) -} - -func (s *OrderServer) UpdateAddressSaleInfo(ctx context.Context, in *order.UpdateAddressSaleInfoRequest) (*order.UpdateAddressSaleInfoResponse, error) { - l := logic.NewUpdateAddressSaleInfoLogic(ctx, s.svcCtx) - return l.UpdateAddressSaleInfo(in) -} - -func (s *OrderServer) UpdateOrderDeliverStatus(ctx context.Context, in *order.UpdateOrderDeliverStatusRequest) (*order.UpdateOrderDeliverStatusResponse, error) { - l := logic.NewUpdateOrderDeliverStatusLogic(ctx, s.svcCtx) - return l.UpdateOrderDeliverStatus(in) -} - -// type 1为销售 2为门店 3为个人 -func (s *OrderServer) GetOrderInfo(ctx context.Context, in *order.GetOrderInfoRequest) (*order.OrderInfoResponse, error) { - l := logic.NewGetOrderInfoLogic(ctx, s.svcCtx) - return l.GetOrderInfo(in) -} - -// status 1 为已支付 4 支付失败,其它的返回错误 -func (s *OrderServer) UpdateOrderPayStatus(ctx context.Context, in *order.UpdateOrderPayStatusRequest) (*order.UpdateOrderPayStatusResponse, error) { - l := logic.NewUpdateOrderPayStatusLogic(ctx, s.svcCtx) - return l.UpdateOrderPayStatus(in) -} diff --git a/services/order/internal/svc/order.go b/services/order/internal/svc/order.go index 9371da6..354bf4d 100644 --- a/services/order/internal/svc/order.go +++ b/services/order/internal/svc/order.go @@ -5,6 +5,7 @@ import ( "fmt" "lone-services/pkg/modelbase" "lone-services/pkg/utils" + express "lone-services/rpc/express/pb" product "lone-services/rpc/product/pb" "lone-services/services/order/internal/dao" "math/rand" @@ -95,3 +96,38 @@ func SetGroupWhere(w *modelbase.Params, adminInfo utils.UserInfo, checkProvince } } } + +func GetDeliveryInfo(name string, id int64, Type uint8) (*express.DeliveryInfoResponse, utils.Status) { + cli, err := GetRpcClient(name) + if err != nil { + logx.Errorf("get rpc client err: %v", err) + return nil, utils.Fail + } + client := express.NewExpressClient(cli.Conn()) + if Type == utils.NumberOne { + info, err := client.GetDeliveryByOrderId(context.Background(), &express.IdRequest{Id: id}) + if err != nil { + logx.Errorf("get products err: %v", err) + return nil, utils.Fail + } + return info, utils.Ok + } + + if Type == dao.OrderTypeOrder { + info, err := client.GetDeliveryByOrderId(context.Background(), &express.IdRequest{Id: id}) + if err != nil { + logx.Errorf("get products err: %v", err) + return nil, utils.Fail + } + + return info, utils.Ok + } + info, err := client.GetDeliveryBySupplyId(context.Background(), &express.IdRequest{Id: id}) + if err != nil { + logx.Errorf("get products err: %v", err) + return nil, utils.Fail + } + + return info, utils.Ok + +} diff --git a/services/order/orderClient/order.go b/services/order/orderClient/order.go index 3eb018b..068e832 100644 --- a/services/order/orderClient/order.go +++ b/services/order/orderClient/order.go @@ -17,6 +17,8 @@ type ( AddressByStoreItemsRequest = order.AddressByStoreItemsRequest AddressItemsRequest = order.AddressItemsRequest AdminCreateOrderRequest = order.AdminCreateOrderRequest + ApiSupplyInfoRequest = order.ApiSupplyInfoRequest + ApiSupplyRequest = order.ApiSupplyRequest CartRequest = order.CartRequest CreateOrderOneRequest = order.CreateOrderOneRequest CreateOrderRequest = order.CreateOrderRequest @@ -33,6 +35,8 @@ type ( OrderItemsRequest = order.OrderItemsRequest ProductItemsResponse = order.ProductItemsResponse Response = order.Response + StatusRequest = order.StatusRequest + SupplyItemsRequest = order.SupplyItemsRequest TypeRequest = order.TypeRequest UpdateAddressSaleInfoRequest = order.UpdateAddressSaleInfoRequest UpdateAddressSaleInfoResponse = order.UpdateAddressSaleInfoResponse @@ -43,6 +47,24 @@ type ( Order interface { Items(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*Response, error) + AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) + AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) + OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) + OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) + OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) + OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) + OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) + SupplyItems(ctx context.Context, in *SupplyItemsRequest, opts ...grpc.CallOption) (*Response, error) + SupplyStatus(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) + UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) + UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) + // type 1为销售 2为门店 3为个人 + GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) + // status 1 为已支付 4 支付失败,其它的返回错误 + UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) + // API + ApiSupply(ctx context.Context, in *ApiSupplyRequest, opts ...grpc.CallOption) (*Response, error) + ApiSupplyInfo(ctx context.Context, in *ApiSupplyInfoRequest, opts ...grpc.CallOption) (*Response, error) WebCreate(ctx context.Context, in *CreateOrderRequest, opts ...grpc.CallOption) (*Response, error) WebCreateOne(ctx context.Context, in *CreateOrderOneRequest, opts ...grpc.CallOption) (*Response, error) WebAddressCreate(ctx context.Context, in *EditAddressRequest, opts ...grpc.CallOption) (*Response, error) @@ -53,19 +75,6 @@ type ( WebAddressItems(ctx context.Context, in *TypeRequest, opts ...grpc.CallOption) (*Response, error) WebCart(ctx context.Context, in *CartRequest, opts ...grpc.CallOption) (*Response, error) WebCartEdit(ctx context.Context, in *EditCartRequest, opts ...grpc.CallOption) (*Response, error) - AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) - AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) - OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) - OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) - OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) - OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) - OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) - UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) - UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) - // type 1为销售 2为门店 3为个人 - GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) - // status 1 为已支付 4 支付失败,其它的返回错误 - UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) } defaultOrder struct { @@ -84,6 +93,84 @@ func (m *defaultOrder) Items(ctx context.Context, in *OrderItemsRequest, opts .. return client.Items(ctx, in, opts...) } +func (m *defaultOrder) AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.AddressItem(ctx, in, opts...) +} + +func (m *defaultOrder) AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.AddressByStore(ctx, in, opts...) +} + +func (m *defaultOrder) OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.OrderAuditingItems(ctx, in, opts...) +} + +func (m *defaultOrder) OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.OrderAuditing(ctx, in, opts...) +} + +func (m *defaultOrder) OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.OrderCreate(ctx, in, opts...) +} + +func (m *defaultOrder) OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.OrderDown(ctx, in, opts...) +} + +func (m *defaultOrder) OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.OrderInfo(ctx, in, opts...) +} + +func (m *defaultOrder) SupplyItems(ctx context.Context, in *SupplyItemsRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.SupplyItems(ctx, in, opts...) +} + +func (m *defaultOrder) SupplyStatus(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.SupplyStatus(ctx, in, opts...) +} + +func (m *defaultOrder) UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.UpdateAddressSaleInfo(ctx, in, opts...) +} + +func (m *defaultOrder) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.UpdateOrderDeliverStatus(ctx, in, opts...) +} + +// type 1为销售 2为门店 3为个人 +func (m *defaultOrder) GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.GetOrderInfo(ctx, in, opts...) +} + +// status 1 为已支付 4 支付失败,其它的返回错误 +func (m *defaultOrder) UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.UpdateOrderPayStatus(ctx, in, opts...) +} + +// API +func (m *defaultOrder) ApiSupply(ctx context.Context, in *ApiSupplyRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.ApiSupply(ctx, in, opts...) +} + +func (m *defaultOrder) ApiSupplyInfo(ctx context.Context, in *ApiSupplyInfoRequest, opts ...grpc.CallOption) (*Response, error) { + client := order.NewOrderClient(m.cli.Conn()) + return client.ApiSupplyInfo(ctx, in, opts...) +} + func (m *defaultOrder) WebCreate(ctx context.Context, in *CreateOrderRequest, opts ...grpc.CallOption) (*Response, error) { client := order.NewOrderClient(m.cli.Conn()) return client.WebCreate(ctx, in, opts...) @@ -133,60 +220,3 @@ func (m *defaultOrder) WebCartEdit(ctx context.Context, in *EditCartRequest, opt client := order.NewOrderClient(m.cli.Conn()) return client.WebCartEdit(ctx, in, opts...) } - -func (m *defaultOrder) AddressItem(ctx context.Context, in *AddressItemsRequest, opts ...grpc.CallOption) (*Response, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.AddressItem(ctx, in, opts...) -} - -func (m *defaultOrder) AddressByStore(ctx context.Context, in *AddressByStoreItemsRequest, opts ...grpc.CallOption) (*Response, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.AddressByStore(ctx, in, opts...) -} - -func (m *defaultOrder) OrderAuditingItems(ctx context.Context, in *OrderAuditingItemsRequest, opts ...grpc.CallOption) (*Response, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.OrderAuditingItems(ctx, in, opts...) -} - -func (m *defaultOrder) OrderAuditing(ctx context.Context, in *OrderAuditingRequest, opts ...grpc.CallOption) (*Response, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.OrderAuditing(ctx, in, opts...) -} - -func (m *defaultOrder) OrderCreate(ctx context.Context, in *AdminCreateOrderRequest, opts ...grpc.CallOption) (*Response, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.OrderCreate(ctx, in, opts...) -} - -func (m *defaultOrder) OrderDown(ctx context.Context, in *OrderItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.OrderDown(ctx, in, opts...) -} - -func (m *defaultOrder) OrderInfo(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.OrderInfo(ctx, in, opts...) -} - -func (m *defaultOrder) UpdateAddressSaleInfo(ctx context.Context, in *UpdateAddressSaleInfoRequest, opts ...grpc.CallOption) (*UpdateAddressSaleInfoResponse, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.UpdateAddressSaleInfo(ctx, in, opts...) -} - -func (m *defaultOrder) UpdateOrderDeliverStatus(ctx context.Context, in *UpdateOrderDeliverStatusRequest, opts ...grpc.CallOption) (*UpdateOrderDeliverStatusResponse, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.UpdateOrderDeliverStatus(ctx, in, opts...) -} - -// type 1为销售 2为门店 3为个人 -func (m *defaultOrder) GetOrderInfo(ctx context.Context, in *GetOrderInfoRequest, opts ...grpc.CallOption) (*OrderInfoResponse, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.GetOrderInfo(ctx, in, opts...) -} - -// status 1 为已支付 4 支付失败,其它的返回错误 -func (m *defaultOrder) UpdateOrderPayStatus(ctx context.Context, in *UpdateOrderPayStatusRequest, opts ...grpc.CallOption) (*UpdateOrderPayStatusResponse, error) { - client := order.NewOrderClient(m.cli.Conn()) - return client.UpdateOrderPayStatus(ctx, in, opts...) -} diff --git a/services/order/validator/supply.go b/services/order/validator/supply.go new file mode 100644 index 0000000..30d7d1e --- /dev/null +++ b/services/order/validator/supply.go @@ -0,0 +1,47 @@ +package validator + +import "lone-services/pkg/validate" + +// SupplyItemsValidator 查看列表 +type SupplyItemsValidator struct { + Page int32 + Size int32 + Time []string + Status int32 `validate:"required"` //1为通过，2为驳回，3为审核中，4为二审中 + OrderSn string +} + +// GetMessage 查看列表 - 提示消息 +func (p SupplyItemsValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Status.required": "状态不能为空", + } +} + +type SupplyValidator struct { + OrderSn string `validate:"required"` + Info string `validate:"required"` + Reason string `validate:"required"` + Images []string `validate:"required"` +} + +// GetMessage 查看列表 - 提示消息 +func (p SupplyValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "OrderSn.required": "缺少订单号", + "Info.required": "缺少信息", + "Reason.required": "缺少理由", + "Images.required": "缺少图片", + } +} + +type SupplyInfoValidator struct { + OrderSn string `validate:"required"` +} + +// GetMessage 查看列表 - 提示消息 +func (p SupplyInfoValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "OrderSn.required": "缺少订单号", + } +}