From 48b2d2dd613af7f4d55f7e76ea19693dec940c35 Mon Sep 17 00:00:00 2001 From: gjs Date: Tue, 22 Sep 2026 18:28:02 +0800 Subject: [PATCH] store --- pkg/wecomrpc/send_message.go | 8 +- rpc/sale/pb/sale.pb.go | 468 ++++++++++++---- rpc/sale/pb/sale_grpc.pb.go | 146 ++++- rpc/sale/sale.pb | Bin 17550 -> 17815 bytes rpc/sale/sale.proto | 43 +- rpc/store/pb/store.pb.go | 512 ++++++++++++++++-- rpc/store/pb/store_grpc.pb.go | 282 +++++++++- rpc/store/store.pb | Bin 19842 -> 21349 bytes rpc/store/store.proto | 77 +++ .../internal/logic/apiLowerSaleItemsLogic.go | 30 + .../sale/internal/logic/apiSaleAddLogic.go | 31 ++ .../sale/internal/logic/apiSaleInfoLogic.go | 30 + services/sale/internal/server/saleServer.go | 18 +- services/sale/run.toml | 3 +- services/sale/saleClient/sale.go | 63 ++- services/sale/validator/validator.go | 37 ++ services/store/internal/dao/store.go | 8 + services/store/internal/logic/createLogic.go | 29 +- .../store/internal/logic/verifyStatusLogic.go | 10 +- .../logic/webCheckPayPasswordLogic.go | 53 ++ services/store/internal/logic/webInfoLogic.go | 56 ++ .../internal/logic/webLowerStoreItemsLogic.go | 125 +++++ .../store/internal/logic/webPayMoneyLogic.go | 50 ++ .../internal/logic/webSetPayPasswordLogic.go | 65 +++ .../store/internal/logic/webStoreAddLogic.go | 263 +++++++++ services/store/internal/model/store.go | 2 +- services/store/internal/server/storeServer.go | 30 + services/store/internal/svc/servicecontext.go | 22 +- services/store/storeclient/store.go | 83 ++- services/store/validator/store.go | 27 +- 30 files changed, 2284 insertions(+), 287 deletions(-) create mode 100644 services/sale/internal/logic/apiLowerSaleItemsLogic.go create mode 100644 services/sale/internal/logic/apiSaleAddLogic.go create mode 100644 services/sale/internal/logic/apiSaleInfoLogic.go create mode 100644 services/store/internal/logic/webCheckPayPasswordLogic.go create mode 100644 services/store/internal/logic/webInfoLogic.go create mode 100644 services/store/internal/logic/webLowerStoreItemsLogic.go create mode 100644 services/store/internal/logic/webPayMoneyLogic.go create mode 100644 services/store/internal/logic/webSetPayPasswordLogic.go create mode 100644 services/store/internal/logic/webStoreAddLogic.go diff --git a/pkg/wecomrpc/send_message.go b/pkg/wecomrpc/send_message.go index e527705..5271a65 100644 --- a/pkg/wecomrpc/send_message.go +++ b/pkg/wecomrpc/send_message.go @@ -25,10 +25,10 @@ func SendMessage(ctx context.Context, wecomSvcName string, job SendMessageJob) { return } _, err = client.SendMessage(ctx, &wecompb.SendMessageReq{ - BizId: int64(job.BizId), - BizType: uint32(job.BizType), - Type: uint32(job.Type), - Action: uint32(job.Action), + BizId: int64(job.BizId), //门店ID或产品ID + BizType: uint32(job.BizType), //产品,门店 表示 + Type: uint32(job.Type), //wecomrpc.ProductSubmitReview, + Action: uint32(job.Action), // 0未用 1通过 2拒绝 Reason: job.Reason, Key: job.Key, }) diff --git a/rpc/sale/pb/sale.pb.go b/rpc/sale/pb/sale.pb.go index 1e92daf..cadbb9f 100644 --- a/rpc/sale/pb/sale.pb.go +++ b/rpc/sale/pb/sale.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v3.19.4 +// protoc v4.25.8 // source: sale/sale.proto package sale @@ -82,6 +82,182 @@ func (x *Response) GetData() string { return "" } +type ApiSaleAddReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + Mobile string `protobuf:"bytes,1,opt,name=Mobile,proto3" json:"Mobile,omitempty"` + Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"` + District string `protobuf:"bytes,3,opt,name=District,proto3" json:"District,omitempty"` + Address string `protobuf:"bytes,4,opt,name=Address,proto3" json:"Address,omitempty"` + Account string `protobuf:"bytes,5,opt,name=Account,proto3" json:"Account,omitempty"` + Credentials string `protobuf:"bytes,6,opt,name=Credentials,proto3" json:"Credentials,omitempty"` + Sex int32 `protobuf:"varint,7,opt,name=Sex,proto3" json:"Sex,omitempty"` + BirthDate string `protobuf:"bytes,8,opt,name=BirthDate,proto3" json:"BirthDate,omitempty"` + Type int32 `protobuf:"varint,9,opt,name=Type,proto3" json:"Type,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiSaleAddReq) Reset() { + *x = ApiSaleAddReq{} + mi := &file_sale_sale_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiSaleAddReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiSaleAddReq) ProtoMessage() {} + +func (x *ApiSaleAddReq) ProtoReflect() protoreflect.Message { + mi := &file_sale_sale_proto_msgTypes[1] + 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 ApiSaleAddReq.ProtoReflect.Descriptor instead. +func (*ApiSaleAddReq) Descriptor() ([]byte, []int) { + return file_sale_sale_proto_rawDescGZIP(), []int{1} +} + +func (x *ApiSaleAddReq) GetMobile() string { + if x != nil { + return x.Mobile + } + return "" +} + +func (x *ApiSaleAddReq) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ApiSaleAddReq) GetDistrict() string { + if x != nil { + return x.District + } + return "" +} + +func (x *ApiSaleAddReq) GetAddress() string { + if x != nil { + return x.Address + } + return "" +} + +func (x *ApiSaleAddReq) GetAccount() string { + if x != nil { + return x.Account + } + return "" +} + +func (x *ApiSaleAddReq) GetCredentials() string { + if x != nil { + return x.Credentials + } + return "" +} + +func (x *ApiSaleAddReq) GetSex() int32 { + if x != nil { + return x.Sex + } + return 0 +} + +func (x *ApiSaleAddReq) GetBirthDate() string { + if x != nil { + return x.BirthDate + } + return "" +} + +func (x *ApiSaleAddReq) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + +type ApiLowerSaleItemsReq 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"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Type int32 `protobuf:"varint,4,opt,name=type,proto3" json:"type,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ApiLowerSaleItemsReq) Reset() { + *x = ApiLowerSaleItemsReq{} + mi := &file_sale_sale_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ApiLowerSaleItemsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApiLowerSaleItemsReq) ProtoMessage() {} + +func (x *ApiLowerSaleItemsReq) ProtoReflect() protoreflect.Message { + mi := &file_sale_sale_proto_msgTypes[2] + 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 ApiLowerSaleItemsReq.ProtoReflect.Descriptor instead. +func (*ApiLowerSaleItemsReq) Descriptor() ([]byte, []int) { + return file_sale_sale_proto_rawDescGZIP(), []int{2} +} + +func (x *ApiLowerSaleItemsReq) GetPage() int32 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *ApiLowerSaleItemsReq) GetSize() int32 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *ApiLowerSaleItemsReq) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ApiLowerSaleItemsReq) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + type GroupEmptyReq struct { state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields @@ -90,7 +266,7 @@ type GroupEmptyReq struct { func (x *GroupEmptyReq) Reset() { *x = GroupEmptyReq{} - mi := &file_sale_sale_proto_msgTypes[1] + mi := &file_sale_sale_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -102,7 +278,7 @@ func (x *GroupEmptyReq) String() string { func (*GroupEmptyReq) ProtoMessage() {} func (x *GroupEmptyReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[1] + mi := &file_sale_sale_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -115,7 +291,7 @@ func (x *GroupEmptyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GroupEmptyReq.ProtoReflect.Descriptor instead. func (*GroupEmptyReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{1} + return file_sale_sale_proto_rawDescGZIP(), []int{3} } type GroupItemsReq struct { @@ -129,7 +305,7 @@ type GroupItemsReq struct { func (x *GroupItemsReq) Reset() { *x = GroupItemsReq{} - mi := &file_sale_sale_proto_msgTypes[2] + mi := &file_sale_sale_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -141,7 +317,7 @@ func (x *GroupItemsReq) String() string { func (*GroupItemsReq) ProtoMessage() {} func (x *GroupItemsReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[2] + mi := &file_sale_sale_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -154,7 +330,7 @@ func (x *GroupItemsReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GroupItemsReq.ProtoReflect.Descriptor instead. func (*GroupItemsReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{2} + return file_sale_sale_proto_rawDescGZIP(), []int{4} } func (x *GroupItemsReq) GetPage() uint32 { @@ -187,7 +363,7 @@ type GroupCreateReq struct { func (x *GroupCreateReq) Reset() { *x = GroupCreateReq{} - mi := &file_sale_sale_proto_msgTypes[3] + mi := &file_sale_sale_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -199,7 +375,7 @@ func (x *GroupCreateReq) String() string { func (*GroupCreateReq) ProtoMessage() {} func (x *GroupCreateReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[3] + mi := &file_sale_sale_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -212,7 +388,7 @@ func (x *GroupCreateReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GroupCreateReq.ProtoReflect.Descriptor instead. func (*GroupCreateReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{3} + return file_sale_sale_proto_rawDescGZIP(), []int{5} } func (x *GroupCreateReq) GetName() string { @@ -233,7 +409,7 @@ type NamesReq struct { func (x *NamesReq) Reset() { *x = NamesReq{} - mi := &file_sale_sale_proto_msgTypes[4] + mi := &file_sale_sale_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -245,7 +421,7 @@ func (x *NamesReq) String() string { func (*NamesReq) ProtoMessage() {} func (x *NamesReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[4] + mi := &file_sale_sale_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -258,7 +434,7 @@ func (x *NamesReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NamesReq.ProtoReflect.Descriptor instead. func (*NamesReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{4} + return file_sale_sale_proto_rawDescGZIP(), []int{6} } func (x *NamesReq) GetType() uint32 { @@ -293,7 +469,7 @@ type NameItem struct { func (x *NameItem) Reset() { *x = NameItem{} - mi := &file_sale_sale_proto_msgTypes[5] + mi := &file_sale_sale_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -305,7 +481,7 @@ func (x *NameItem) String() string { func (*NameItem) ProtoMessage() {} func (x *NameItem) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[5] + mi := &file_sale_sale_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -318,7 +494,7 @@ func (x *NameItem) ProtoReflect() protoreflect.Message { // Deprecated: Use NameItem.ProtoReflect.Descriptor instead. func (*NameItem) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{5} + return file_sale_sale_proto_rawDescGZIP(), []int{7} } func (x *NameItem) GetId() int64 { @@ -351,7 +527,7 @@ type NamesData struct { func (x *NamesData) Reset() { *x = NamesData{} - mi := &file_sale_sale_proto_msgTypes[6] + mi := &file_sale_sale_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -363,7 +539,7 @@ func (x *NamesData) String() string { func (*NamesData) ProtoMessage() {} func (x *NamesData) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[6] + mi := &file_sale_sale_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -376,7 +552,7 @@ func (x *NamesData) ProtoReflect() protoreflect.Message { // Deprecated: Use NamesData.ProtoReflect.Descriptor instead. func (*NamesData) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{6} + return file_sale_sale_proto_rawDescGZIP(), []int{8} } func (x *NamesData) GetItems() []*NameItem { @@ -411,7 +587,7 @@ type CreateReq struct { func (x *CreateReq) Reset() { *x = CreateReq{} - mi := &file_sale_sale_proto_msgTypes[7] + mi := &file_sale_sale_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -423,7 +599,7 @@ func (x *CreateReq) String() string { func (*CreateReq) ProtoMessage() {} func (x *CreateReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[7] + mi := &file_sale_sale_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -436,7 +612,7 @@ func (x *CreateReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateReq.ProtoReflect.Descriptor instead. func (*CreateReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{7} + return file_sale_sale_proto_rawDescGZIP(), []int{9} } func (x *CreateReq) GetMobile() string { @@ -583,7 +759,7 @@ type EditReq struct { func (x *EditReq) Reset() { *x = EditReq{} - mi := &file_sale_sale_proto_msgTypes[8] + mi := &file_sale_sale_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -595,7 +771,7 @@ func (x *EditReq) String() string { func (*EditReq) ProtoMessage() {} func (x *EditReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[8] + mi := &file_sale_sale_proto_msgTypes[10] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -608,7 +784,7 @@ func (x *EditReq) ProtoReflect() protoreflect.Message { // Deprecated: Use EditReq.ProtoReflect.Descriptor instead. func (*EditReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{8} + return file_sale_sale_proto_rawDescGZIP(), []int{10} } func (x *EditReq) GetId() int64 { @@ -739,7 +915,7 @@ type InfoReq struct { func (x *InfoReq) Reset() { *x = InfoReq{} - mi := &file_sale_sale_proto_msgTypes[9] + mi := &file_sale_sale_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -751,7 +927,7 @@ func (x *InfoReq) String() string { func (*InfoReq) ProtoMessage() {} func (x *InfoReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[9] + mi := &file_sale_sale_proto_msgTypes[11] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -764,7 +940,7 @@ func (x *InfoReq) ProtoReflect() protoreflect.Message { // Deprecated: Use InfoReq.ProtoReflect.Descriptor instead. func (*InfoReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{9} + return file_sale_sale_proto_rawDescGZIP(), []int{11} } func (x *InfoReq) GetId() int64 { @@ -783,7 +959,7 @@ type InfoByUserIdReq struct { func (x *InfoByUserIdReq) Reset() { *x = InfoByUserIdReq{} - mi := &file_sale_sale_proto_msgTypes[10] + mi := &file_sale_sale_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -795,7 +971,7 @@ func (x *InfoByUserIdReq) String() string { func (*InfoByUserIdReq) ProtoMessage() {} func (x *InfoByUserIdReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[10] + mi := &file_sale_sale_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -808,7 +984,7 @@ func (x *InfoByUserIdReq) ProtoReflect() protoreflect.Message { // Deprecated: Use InfoByUserIdReq.ProtoReflect.Descriptor instead. func (*InfoByUserIdReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{10} + return file_sale_sale_proto_rawDescGZIP(), []int{12} } func (x *InfoByUserIdReq) GetUserId() int64 { @@ -829,7 +1005,7 @@ type Region struct { func (x *Region) Reset() { *x = Region{} - mi := &file_sale_sale_proto_msgTypes[11] + mi := &file_sale_sale_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -841,7 +1017,7 @@ func (x *Region) String() string { func (*Region) ProtoMessage() {} func (x *Region) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[11] + mi := &file_sale_sale_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -854,7 +1030,7 @@ func (x *Region) ProtoReflect() protoreflect.Message { // Deprecated: Use Region.ProtoReflect.Descriptor instead. func (*Region) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{11} + return file_sale_sale_proto_rawDescGZIP(), []int{13} } func (x *Region) GetProvince() string { @@ -888,7 +1064,7 @@ type GroupItem struct { func (x *GroupItem) Reset() { *x = GroupItem{} - mi := &file_sale_sale_proto_msgTypes[12] + mi := &file_sale_sale_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -900,7 +1076,7 @@ func (x *GroupItem) String() string { func (*GroupItem) ProtoMessage() {} func (x *GroupItem) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[12] + mi := &file_sale_sale_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -913,7 +1089,7 @@ func (x *GroupItem) ProtoReflect() protoreflect.Message { // Deprecated: Use GroupItem.ProtoReflect.Descriptor instead. func (*GroupItem) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{12} + return file_sale_sale_proto_rawDescGZIP(), []int{14} } func (x *GroupItem) GetId() int64 { @@ -967,7 +1143,7 @@ type InfoData struct { func (x *InfoData) Reset() { *x = InfoData{} - mi := &file_sale_sale_proto_msgTypes[13] + mi := &file_sale_sale_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -979,7 +1155,7 @@ func (x *InfoData) String() string { func (*InfoData) ProtoMessage() {} func (x *InfoData) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[13] + mi := &file_sale_sale_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -992,7 +1168,7 @@ func (x *InfoData) ProtoReflect() protoreflect.Message { // Deprecated: Use InfoData.ProtoReflect.Descriptor instead. func (*InfoData) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{13} + return file_sale_sale_proto_rawDescGZIP(), []int{15} } func (x *InfoData) GetId() int64 { @@ -1212,7 +1388,7 @@ type ItemsReq struct { func (x *ItemsReq) Reset() { *x = ItemsReq{} - mi := &file_sale_sale_proto_msgTypes[14] + mi := &file_sale_sale_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1224,7 +1400,7 @@ func (x *ItemsReq) String() string { func (*ItemsReq) ProtoMessage() {} func (x *ItemsReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[14] + mi := &file_sale_sale_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1237,7 +1413,7 @@ func (x *ItemsReq) ProtoReflect() protoreflect.Message { // Deprecated: Use ItemsReq.ProtoReflect.Descriptor instead. func (*ItemsReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{14} + return file_sale_sale_proto_rawDescGZIP(), []int{16} } func (x *ItemsReq) GetName() string { @@ -1293,7 +1469,7 @@ type StatusReq struct { func (x *StatusReq) Reset() { *x = StatusReq{} - mi := &file_sale_sale_proto_msgTypes[15] + mi := &file_sale_sale_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1305,7 +1481,7 @@ func (x *StatusReq) String() string { func (*StatusReq) ProtoMessage() {} func (x *StatusReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[15] + mi := &file_sale_sale_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1318,7 +1494,7 @@ func (x *StatusReq) ProtoReflect() protoreflect.Message { // Deprecated: Use StatusReq.ProtoReflect.Descriptor instead. func (*StatusReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{15} + return file_sale_sale_proto_rawDescGZIP(), []int{17} } func (x *StatusReq) GetId() int64 { @@ -1351,7 +1527,7 @@ type NamesByIdsReq struct { func (x *NamesByIdsReq) Reset() { *x = NamesByIdsReq{} - mi := &file_sale_sale_proto_msgTypes[16] + mi := &file_sale_sale_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1363,7 +1539,7 @@ func (x *NamesByIdsReq) String() string { func (*NamesByIdsReq) ProtoMessage() {} func (x *NamesByIdsReq) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[16] + mi := &file_sale_sale_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1376,7 +1552,7 @@ func (x *NamesByIdsReq) ProtoReflect() protoreflect.Message { // Deprecated: Use NamesByIdsReq.ProtoReflect.Descriptor instead. func (*NamesByIdsReq) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{16} + return file_sale_sale_proto_rawDescGZIP(), []int{18} } func (x *NamesByIdsReq) GetIds() []int64 { @@ -1396,7 +1572,7 @@ type NamesByIdsItem struct { func (x *NamesByIdsItem) Reset() { *x = NamesByIdsItem{} - mi := &file_sale_sale_proto_msgTypes[17] + mi := &file_sale_sale_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1408,7 +1584,7 @@ func (x *NamesByIdsItem) String() string { func (*NamesByIdsItem) ProtoMessage() {} func (x *NamesByIdsItem) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[17] + mi := &file_sale_sale_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1421,7 +1597,7 @@ func (x *NamesByIdsItem) ProtoReflect() protoreflect.Message { // Deprecated: Use NamesByIdsItem.ProtoReflect.Descriptor instead. func (*NamesByIdsItem) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{17} + return file_sale_sale_proto_rawDescGZIP(), []int{19} } func (x *NamesByIdsItem) GetId() int64 { @@ -1447,7 +1623,7 @@ type NamesByIdsData struct { func (x *NamesByIdsData) Reset() { *x = NamesByIdsData{} - mi := &file_sale_sale_proto_msgTypes[18] + mi := &file_sale_sale_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1459,7 +1635,7 @@ func (x *NamesByIdsData) String() string { func (*NamesByIdsData) ProtoMessage() {} func (x *NamesByIdsData) ProtoReflect() protoreflect.Message { - mi := &file_sale_sale_proto_msgTypes[18] + mi := &file_sale_sale_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1472,7 +1648,7 @@ func (x *NamesByIdsData) ProtoReflect() protoreflect.Message { // Deprecated: Use NamesByIdsData.ProtoReflect.Descriptor instead. func (*NamesByIdsData) Descriptor() ([]byte, []int) { - return file_sale_sale_proto_rawDescGZIP(), []int{18} + return file_sale_sale_proto_rawDescGZIP(), []int{20} } func (x *NamesByIdsData) GetItems() []*NamesByIdsItem { @@ -1482,6 +1658,42 @@ func (x *NamesByIdsData) GetItems() []*NamesByIdsItem { return nil } +type EmptyReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *EmptyReq) Reset() { + *x = EmptyReq{} + mi := &file_sale_sale_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *EmptyReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*EmptyReq) ProtoMessage() {} + +func (x *EmptyReq) ProtoReflect() protoreflect.Message { + mi := &file_sale_sale_proto_msgTypes[21] + 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 EmptyReq.ProtoReflect.Descriptor instead. +func (*EmptyReq) Descriptor() ([]byte, []int) { + return file_sale_sale_proto_rawDescGZIP(), []int{21} +} + var File_sale_sale_proto protoreflect.FileDescriptor const file_sale_sale_proto_rawDesc = "" + @@ -1490,7 +1702,22 @@ const file_sale_sale_proto_rawDesc = "" + "\bResponse\x12\x12\n" + "\x04code\x18\x01 \x01(\x05R\x04code\x12\x10\n" + "\x03msg\x18\x02 \x01(\tR\x03msg\x12\x12\n" + - "\x04data\x18\x03 \x01(\tR\x04data\"\x0f\n" + + "\x04data\x18\x03 \x01(\tR\x04data\"\xf1\x01\n" + + "\rApiSaleAddReq\x12\x16\n" + + "\x06Mobile\x18\x01 \x01(\tR\x06Mobile\x12\x12\n" + + "\x04Name\x18\x02 \x01(\tR\x04Name\x12\x1a\n" + + "\bDistrict\x18\x03 \x01(\tR\bDistrict\x12\x18\n" + + "\aAddress\x18\x04 \x01(\tR\aAddress\x12\x18\n" + + "\aAccount\x18\x05 \x01(\tR\aAccount\x12 \n" + + "\vCredentials\x18\x06 \x01(\tR\vCredentials\x12\x10\n" + + "\x03Sex\x18\a \x01(\x05R\x03Sex\x12\x1c\n" + + "\tBirthDate\x18\b \x01(\tR\tBirthDate\x12\x12\n" + + "\x04Type\x18\t \x01(\x05R\x04Type\"f\n" + + "\x14ApiLowerSaleItemsReq\x12\x12\n" + + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + + "\x04size\x18\x02 \x01(\x05R\x04size\x12\x12\n" + + "\x04name\x18\x03 \x01(\tR\x04name\x12\x12\n" + + "\x04type\x18\x04 \x01(\x05R\x04type\"\x0f\n" + "\rGroupEmptyReq\"T\n" + "\rGroupItemsReq\x12\x12\n" + "\x04page\x18\x01 \x01(\rR\x04page\x12\x1b\n" + @@ -1620,7 +1847,9 @@ const file_sale_sale_proto_rawDesc = "" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" + "\x04name\x18\x02 \x01(\tR\x04name\"<\n" + "\x0eNamesByIdsData\x12*\n" + - "\x05items\x18\x01 \x03(\v2\x14.sale.NamesByIdsItemR\x05items2\xde\a\n" + + "\x05items\x18\x01 \x03(\v2\x14.sale.NamesByIdsItemR\x05items\"\n" + + "\n" + + "\bEmptyReq2\xde\t\n" + "\x04Sale\x12S\n" + "\n" + "GroupItems\x12\x13.sale.GroupItemsReq\x1a\x0e.sale.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/admin/v3/sales/group\x12U\n" + @@ -1634,7 +1863,11 @@ const file_sale_sale_proto_rawDesc = "" + "\x04Edit\x12\r.sale.EditReq\x1a\x0e.sale.Response\"\x1a\x82\xd3\xe4\x93\x02\x14:\x01*\x1a\x0f/admin/v3/sales\x12F\n" + "\x04Info\x12\r.sale.InfoReq\x1a\x0e.sale.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/admin/v3/sales/info\x12C\n" + "\x05Items\x12\x0e.sale.ItemsReq\x1a\x0e.sale.Response\"\x1a\x82\xd3\xe4\x93\x02\x14:\x01*\x12\x0f/admin/v3/sales\x12L\n" + - "\x06Status\x12\x0f.sale.StatusReq\x1a\x0e.sale.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x1a\x16/admin/v3/sales/status\x12-\n" + + "\x06Status\x12\x0f.sale.StatusReq\x1a\x0e.sale.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x1a\x16/admin/v3/sales/status\x12O\n" + + "\n" + + "ApiSaleAdd\x12\x13.sale.ApiSaleAddReq\x1a\x0e.sale.Response\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\x1a\x11/api/v3/sales/add\x12_\n" + + "\x11ApiLowerSaleItems\x12\x1a.sale.ApiLowerSaleItemsReq\x1a\x0e.sale.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\x1a\x13/api/v3/sales/lower\x12L\n" + + "\vApiSaleInfo\x12\x0e.sale.EmptyReq\x1a\x0e.sale.Response\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\x1a\x12/api/v3/sales/info\x12-\n" + "\fInfoInternal\x12\r.sale.InfoReq\x1a\x0e.sale.InfoData\x125\n" + "\fInfoByUserId\x12\x15.sale.InfoByUserIdReq\x1a\x0e.sale.InfoData\x127\n" + "\n" + @@ -1652,63 +1885,72 @@ func file_sale_sale_proto_rawDescGZIP() []byte { return file_sale_sale_proto_rawDescData } -var file_sale_sale_proto_msgTypes = make([]protoimpl.MessageInfo, 19) +var file_sale_sale_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_sale_sale_proto_goTypes = []any{ - (*Response)(nil), // 0: sale.Response - (*GroupEmptyReq)(nil), // 1: sale.GroupEmptyReq - (*GroupItemsReq)(nil), // 2: sale.GroupItemsReq - (*GroupCreateReq)(nil), // 3: sale.GroupCreateReq - (*NamesReq)(nil), // 4: sale.NamesReq - (*NameItem)(nil), // 5: sale.NameItem - (*NamesData)(nil), // 6: sale.NamesData - (*CreateReq)(nil), // 7: sale.CreateReq - (*EditReq)(nil), // 8: sale.EditReq - (*InfoReq)(nil), // 9: sale.InfoReq - (*InfoByUserIdReq)(nil), // 10: sale.InfoByUserIdReq - (*Region)(nil), // 11: sale.Region - (*GroupItem)(nil), // 12: sale.GroupItem - (*InfoData)(nil), // 13: sale.InfoData - (*ItemsReq)(nil), // 14: sale.ItemsReq - (*StatusReq)(nil), // 15: sale.StatusReq - (*NamesByIdsReq)(nil), // 16: sale.NamesByIdsReq - (*NamesByIdsItem)(nil), // 17: sale.NamesByIdsItem - (*NamesByIdsData)(nil), // 18: sale.NamesByIdsData + (*Response)(nil), // 0: sale.Response + (*ApiSaleAddReq)(nil), // 1: sale.ApiSaleAddReq + (*ApiLowerSaleItemsReq)(nil), // 2: sale.ApiLowerSaleItemsReq + (*GroupEmptyReq)(nil), // 3: sale.GroupEmptyReq + (*GroupItemsReq)(nil), // 4: sale.GroupItemsReq + (*GroupCreateReq)(nil), // 5: sale.GroupCreateReq + (*NamesReq)(nil), // 6: sale.NamesReq + (*NameItem)(nil), // 7: sale.NameItem + (*NamesData)(nil), // 8: sale.NamesData + (*CreateReq)(nil), // 9: sale.CreateReq + (*EditReq)(nil), // 10: sale.EditReq + (*InfoReq)(nil), // 11: sale.InfoReq + (*InfoByUserIdReq)(nil), // 12: sale.InfoByUserIdReq + (*Region)(nil), // 13: sale.Region + (*GroupItem)(nil), // 14: sale.GroupItem + (*InfoData)(nil), // 15: sale.InfoData + (*ItemsReq)(nil), // 16: sale.ItemsReq + (*StatusReq)(nil), // 17: sale.StatusReq + (*NamesByIdsReq)(nil), // 18: sale.NamesByIdsReq + (*NamesByIdsItem)(nil), // 19: sale.NamesByIdsItem + (*NamesByIdsData)(nil), // 20: sale.NamesByIdsData + (*EmptyReq)(nil), // 21: sale.EmptyReq } var file_sale_sale_proto_depIdxs = []int32{ - 5, // 0: sale.NamesData.items:type_name -> sale.NameItem - 11, // 1: sale.InfoData.region:type_name -> sale.Region - 12, // 2: sale.InfoData.group:type_name -> sale.GroupItem - 17, // 3: sale.NamesByIdsData.items:type_name -> sale.NamesByIdsItem - 2, // 4: sale.Sale.GroupItems:input_type -> sale.GroupItemsReq - 3, // 5: sale.Sale.GroupCreate:input_type -> sale.GroupCreateReq - 1, // 6: sale.Sale.GroupNames:input_type -> sale.GroupEmptyReq - 1, // 7: sale.Sale.Types:input_type -> sale.GroupEmptyReq - 4, // 8: sale.Sale.Names:input_type -> sale.NamesReq - 4, // 9: sale.Sale.NamesInternal:input_type -> sale.NamesReq - 7, // 10: sale.Sale.Create:input_type -> sale.CreateReq - 8, // 11: sale.Sale.Edit:input_type -> sale.EditReq - 9, // 12: sale.Sale.Info:input_type -> sale.InfoReq - 14, // 13: sale.Sale.Items:input_type -> sale.ItemsReq - 15, // 14: sale.Sale.Status:input_type -> sale.StatusReq - 9, // 15: sale.Sale.InfoInternal:input_type -> sale.InfoReq - 10, // 16: sale.Sale.InfoByUserId:input_type -> sale.InfoByUserIdReq - 16, // 17: sale.Sale.NamesByIds:input_type -> sale.NamesByIdsReq - 0, // 18: sale.Sale.GroupItems:output_type -> sale.Response - 0, // 19: sale.Sale.GroupCreate:output_type -> sale.Response - 0, // 20: sale.Sale.GroupNames:output_type -> sale.Response - 0, // 21: sale.Sale.Types:output_type -> sale.Response - 0, // 22: sale.Sale.Names:output_type -> sale.Response - 6, // 23: sale.Sale.NamesInternal:output_type -> sale.NamesData - 0, // 24: sale.Sale.Create:output_type -> sale.Response - 0, // 25: sale.Sale.Edit:output_type -> sale.Response - 0, // 26: sale.Sale.Info:output_type -> sale.Response - 0, // 27: sale.Sale.Items:output_type -> sale.Response - 0, // 28: sale.Sale.Status:output_type -> sale.Response - 13, // 29: sale.Sale.InfoInternal:output_type -> sale.InfoData - 13, // 30: sale.Sale.InfoByUserId:output_type -> sale.InfoData - 18, // 31: sale.Sale.NamesByIds:output_type -> sale.NamesByIdsData - 18, // [18:32] is the sub-list for method output_type - 4, // [4:18] is the sub-list for method input_type + 7, // 0: sale.NamesData.items:type_name -> sale.NameItem + 13, // 1: sale.InfoData.region:type_name -> sale.Region + 14, // 2: sale.InfoData.group:type_name -> sale.GroupItem + 19, // 3: sale.NamesByIdsData.items:type_name -> sale.NamesByIdsItem + 4, // 4: sale.Sale.GroupItems:input_type -> sale.GroupItemsReq + 5, // 5: sale.Sale.GroupCreate:input_type -> sale.GroupCreateReq + 3, // 6: sale.Sale.GroupNames:input_type -> sale.GroupEmptyReq + 3, // 7: sale.Sale.Types:input_type -> sale.GroupEmptyReq + 6, // 8: sale.Sale.Names:input_type -> sale.NamesReq + 6, // 9: sale.Sale.NamesInternal:input_type -> sale.NamesReq + 9, // 10: sale.Sale.Create:input_type -> sale.CreateReq + 10, // 11: sale.Sale.Edit:input_type -> sale.EditReq + 11, // 12: sale.Sale.Info:input_type -> sale.InfoReq + 16, // 13: sale.Sale.Items:input_type -> sale.ItemsReq + 17, // 14: sale.Sale.Status:input_type -> sale.StatusReq + 1, // 15: sale.Sale.ApiSaleAdd:input_type -> sale.ApiSaleAddReq + 2, // 16: sale.Sale.ApiLowerSaleItems:input_type -> sale.ApiLowerSaleItemsReq + 21, // 17: sale.Sale.ApiSaleInfo:input_type -> sale.EmptyReq + 11, // 18: sale.Sale.InfoInternal:input_type -> sale.InfoReq + 12, // 19: sale.Sale.InfoByUserId:input_type -> sale.InfoByUserIdReq + 18, // 20: sale.Sale.NamesByIds:input_type -> sale.NamesByIdsReq + 0, // 21: sale.Sale.GroupItems:output_type -> sale.Response + 0, // 22: sale.Sale.GroupCreate:output_type -> sale.Response + 0, // 23: sale.Sale.GroupNames:output_type -> sale.Response + 0, // 24: sale.Sale.Types:output_type -> sale.Response + 0, // 25: sale.Sale.Names:output_type -> sale.Response + 8, // 26: sale.Sale.NamesInternal:output_type -> sale.NamesData + 0, // 27: sale.Sale.Create:output_type -> sale.Response + 0, // 28: sale.Sale.Edit:output_type -> sale.Response + 0, // 29: sale.Sale.Info:output_type -> sale.Response + 0, // 30: sale.Sale.Items:output_type -> sale.Response + 0, // 31: sale.Sale.Status:output_type -> sale.Response + 0, // 32: sale.Sale.ApiSaleAdd:output_type -> sale.Response + 0, // 33: sale.Sale.ApiLowerSaleItems:output_type -> sale.Response + 0, // 34: sale.Sale.ApiSaleInfo:output_type -> sale.Response + 15, // 35: sale.Sale.InfoInternal:output_type -> sale.InfoData + 15, // 36: sale.Sale.InfoByUserId:output_type -> sale.InfoData + 20, // 37: sale.Sale.NamesByIds:output_type -> sale.NamesByIdsData + 21, // [21:38] is the sub-list for method output_type + 4, // [4:21] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name 4, // [4:4] is the sub-list for extension extendee 0, // [0:4] is the sub-list for field type_name @@ -1725,7 +1967,7 @@ func file_sale_sale_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_sale_sale_proto_rawDesc), len(file_sale_sale_proto_rawDesc)), NumEnums: 0, - NumMessages: 19, + NumMessages: 22, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/sale/pb/sale_grpc.pb.go b/rpc/sale/pb/sale_grpc.pb.go index ed375a6..e738ca6 100644 --- a/rpc/sale/pb/sale_grpc.pb.go +++ b/rpc/sale/pb/sale_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.6.2 -// - protoc v3.19.4 +// - protoc v4.25.8 // source: sale/sale.proto package sale @@ -19,20 +19,23 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Sale_GroupItems_FullMethodName = "/sale.Sale/GroupItems" - Sale_GroupCreate_FullMethodName = "/sale.Sale/GroupCreate" - Sale_GroupNames_FullMethodName = "/sale.Sale/GroupNames" - Sale_Types_FullMethodName = "/sale.Sale/Types" - Sale_Names_FullMethodName = "/sale.Sale/Names" - Sale_NamesInternal_FullMethodName = "/sale.Sale/NamesInternal" - Sale_Create_FullMethodName = "/sale.Sale/Create" - Sale_Edit_FullMethodName = "/sale.Sale/Edit" - Sale_Info_FullMethodName = "/sale.Sale/Info" - Sale_Items_FullMethodName = "/sale.Sale/Items" - Sale_Status_FullMethodName = "/sale.Sale/Status" - Sale_InfoInternal_FullMethodName = "/sale.Sale/InfoInternal" - Sale_InfoByUserId_FullMethodName = "/sale.Sale/InfoByUserId" - Sale_NamesByIds_FullMethodName = "/sale.Sale/NamesByIds" + Sale_GroupItems_FullMethodName = "/sale.Sale/GroupItems" + Sale_GroupCreate_FullMethodName = "/sale.Sale/GroupCreate" + Sale_GroupNames_FullMethodName = "/sale.Sale/GroupNames" + Sale_Types_FullMethodName = "/sale.Sale/Types" + Sale_Names_FullMethodName = "/sale.Sale/Names" + Sale_NamesInternal_FullMethodName = "/sale.Sale/NamesInternal" + Sale_Create_FullMethodName = "/sale.Sale/Create" + Sale_Edit_FullMethodName = "/sale.Sale/Edit" + Sale_Info_FullMethodName = "/sale.Sale/Info" + Sale_Items_FullMethodName = "/sale.Sale/Items" + Sale_Status_FullMethodName = "/sale.Sale/Status" + Sale_ApiSaleAdd_FullMethodName = "/sale.Sale/ApiSaleAdd" + Sale_ApiLowerSaleItems_FullMethodName = "/sale.Sale/ApiLowerSaleItems" + Sale_ApiSaleInfo_FullMethodName = "/sale.Sale/ApiSaleInfo" + Sale_InfoInternal_FullMethodName = "/sale.Sale/InfoInternal" + Sale_InfoByUserId_FullMethodName = "/sale.Sale/InfoByUserId" + Sale_NamesByIds_FullMethodName = "/sale.Sale/NamesByIds" ) // SaleClient is the client API for Sale service. @@ -52,6 +55,10 @@ type SaleClient interface { Info(ctx context.Context, in *InfoReq, opts ...grpc.CallOption) (*Response, error) Items(ctx context.Context, in *ItemsReq, opts ...grpc.CallOption) (*Response, error) Status(ctx context.Context, in *StatusReq, opts ...grpc.CallOption) (*Response, error) + // ********************API************************ + ApiSaleAdd(ctx context.Context, in *ApiSaleAddReq, opts ...grpc.CallOption) (*Response, error) + ApiLowerSaleItems(ctx context.Context, in *ApiLowerSaleItemsReq, opts ...grpc.CallOption) (*Response, error) + ApiSaleInfo(ctx context.Context, in *EmptyReq, opts ...grpc.CallOption) (*Response, error) // 销售详情 InfoInternal(ctx context.Context, in *InfoReq, opts ...grpc.CallOption) (*InfoData, error) // 按 user_id 查销售详情(内部) @@ -178,6 +185,36 @@ func (c *saleClient) Status(ctx context.Context, in *StatusReq, opts ...grpc.Cal return out, nil } +func (c *saleClient) ApiSaleAdd(ctx context.Context, in *ApiSaleAddReq, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Sale_ApiSaleAdd_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *saleClient) ApiLowerSaleItems(ctx context.Context, in *ApiLowerSaleItemsReq, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Sale_ApiLowerSaleItems_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *saleClient) ApiSaleInfo(ctx context.Context, in *EmptyReq, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Sale_ApiSaleInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *saleClient) InfoInternal(ctx context.Context, in *InfoReq, opts ...grpc.CallOption) (*InfoData, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(InfoData) @@ -225,6 +262,10 @@ type SaleServer interface { Info(context.Context, *InfoReq) (*Response, error) Items(context.Context, *ItemsReq) (*Response, error) Status(context.Context, *StatusReq) (*Response, error) + // ********************API************************ + ApiSaleAdd(context.Context, *ApiSaleAddReq) (*Response, error) + ApiLowerSaleItems(context.Context, *ApiLowerSaleItemsReq) (*Response, error) + ApiSaleInfo(context.Context, *EmptyReq) (*Response, error) // 销售详情 InfoInternal(context.Context, *InfoReq) (*InfoData, error) // 按 user_id 查销售详情(内部) @@ -274,6 +315,15 @@ func (UnimplementedSaleServer) Items(context.Context, *ItemsReq) (*Response, err func (UnimplementedSaleServer) Status(context.Context, *StatusReq) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method Status not implemented") } +func (UnimplementedSaleServer) ApiSaleAdd(context.Context, *ApiSaleAddReq) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiSaleAdd not implemented") +} +func (UnimplementedSaleServer) ApiLowerSaleItems(context.Context, *ApiLowerSaleItemsReq) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiLowerSaleItems not implemented") +} +func (UnimplementedSaleServer) ApiSaleInfo(context.Context, *EmptyReq) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method ApiSaleInfo not implemented") +} func (UnimplementedSaleServer) InfoInternal(context.Context, *InfoReq) (*InfoData, error) { return nil, status.Error(codes.Unimplemented, "method InfoInternal not implemented") } @@ -502,6 +552,60 @@ func _Sale_Status_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _Sale_ApiSaleAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiSaleAddReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SaleServer).ApiSaleAdd(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Sale_ApiSaleAdd_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SaleServer).ApiSaleAdd(ctx, req.(*ApiSaleAddReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Sale_ApiLowerSaleItems_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApiLowerSaleItemsReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SaleServer).ApiLowerSaleItems(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Sale_ApiLowerSaleItems_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SaleServer).ApiLowerSaleItems(ctx, req.(*ApiLowerSaleItemsReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Sale_ApiSaleInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmptyReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SaleServer).ApiSaleInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Sale_ApiSaleInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SaleServer).ApiSaleInfo(ctx, req.(*EmptyReq)) + } + return interceptor(ctx, in, info, handler) +} + func _Sale_InfoInternal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(InfoReq) if err := dec(in); err != nil { @@ -607,6 +711,18 @@ var Sale_ServiceDesc = grpc.ServiceDesc{ MethodName: "Status", Handler: _Sale_Status_Handler, }, + { + MethodName: "ApiSaleAdd", + Handler: _Sale_ApiSaleAdd_Handler, + }, + { + MethodName: "ApiLowerSaleItems", + Handler: _Sale_ApiLowerSaleItems_Handler, + }, + { + MethodName: "ApiSaleInfo", + Handler: _Sale_ApiSaleInfo_Handler, + }, { MethodName: "InfoInternal", Handler: _Sale_InfoInternal_Handler, diff --git a/rpc/sale/sale.pb b/rpc/sale/sale.pb index ad77b67f4f05caec8c9a221781a7928eba4e538a..e09f58a4ffdb130a66bebd4e85ca5b6cd044a4d8 100644 GIT binary patch delta 802 zcmZ8dJ8aWH7}hxtI~PjQYt&vsXsd!$ClU=5+M!d@#DPeuQ#l2JDp5@05|VrF5g*kD0IOrUmP>B<7Wb4VzQ_5a`N{?FSlz{@T0<~7GXzec*; zIj~B8aPrU*;qlMi-yr;ie(kPDJjuO+@LjFqMageCQJ0OBWMM*xt za$#**k@AJhEZz+t+rmV zu!rIO9bw2jiEYg^v6oSQSH@H-tvgK%Z~A(ayQ4`M%(k_v*0glBZel-U|AkN(ddk{; z%sY%vp(BdJz@px^YB|-?u)rJxfS$dwVQ4tO3~ZiShY_c9v2{zPcLPBBh?!sJ(9&C&4Y)PF{SMi42LE0hi43z_I8m8R*X zq!uR^Wfqj=7wMH5f<)reGILVn5yJ7ssU`8L6(y;8#hLkeQo2}lxdC;!z|9FxEpde@ zSDL}P*@;A5k}${7XF;#`V>Znw+bV1>;`VkemElBV8V% zco8F~5R0F`pQ}U*`yxheA+|8rAWyeQiRY6WHIrpvYD9$ieO&$ALpmz4`MhM6u6}(mXsEy z77NL9ykr;R0EuQLmL*CFfLLBY7F>Ze$18RrHjr?7z7!vbcF%`PDs!~?32}i03yShf z@(rbgKy1DMFbAe;bA=8!6Vp8A&8>PGjP<1`5tS~K3XLdmv|x#-;{4L0Jx4gdhaYt$wH diff --git a/rpc/sale/sale.proto b/rpc/sale/sale.proto index cb1b34b..c5e09a5 100644 --- a/rpc/sale/sale.proto +++ b/rpc/sale/sale.proto @@ -24,7 +24,6 @@ service Sale { body: "*" }; } - // 销售管理 rpc Types(GroupEmptyReq) returns (Response) { option (google.api.http) = { @@ -70,6 +69,26 @@ service Sale { }; } + /*********************API*************************/ + rpc ApiSaleAdd(ApiSaleAddReq) returns (Response) { + option (google.api.http) = { + put:"/api/v3/sales/add" + body: "*" + }; + } + rpc ApiLowerSaleItems(ApiLowerSaleItemsReq) returns (Response) { + option (google.api.http) = { + put: "/api/v3/sales/lower" + body: "*" + }; + } + rpc ApiSaleInfo(EmptyReq) returns (Response) { + option (google.api.http) = { + put: "/api/v3/sales/info" + body: "*" + }; + } + // 销售详情 rpc InfoInternal(InfoReq) returns (InfoData); // 按 user_id 查销售详情(内部) @@ -84,6 +103,25 @@ message Response { string data = 3; } +message ApiSaleAddReq { + string Mobile = 1; + string Name = 2; + string District = 3; + string Address = 4; + string Account = 5; + string Credentials = 6; + int32 Sex = 7; + string BirthDate = 8; + int32 Type = 9; +} + +message ApiLowerSaleItemsReq { + int32 page = 1; + int32 size = 2; + string name = 3; + int32 type = 4; +} + message GroupEmptyReq {} message GroupItemsReq { @@ -230,3 +268,6 @@ message NamesByIdsItem { message NamesByIdsData { repeated NamesByIdsItem items = 1; } +message EmptyReq { + +} \ No newline at end of file diff --git a/rpc/store/pb/store.pb.go b/rpc/store/pb/store.pb.go index 0076f6e..7e51d7e 100644 --- a/rpc/store/pb/store.pb.go +++ b/rpc/store/pb/store.pb.go @@ -1886,6 +1886,346 @@ func (x *ExcelExportResponse) GetMsg() string { return "" } +type WebSetPayPasswordRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Password string `protobuf:"bytes,1,opt,name=password,proto3" json:"password,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *WebSetPayPasswordRequest) Reset() { + *x = WebSetPayPasswordRequest{} + mi := &file_store_store_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *WebSetPayPasswordRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WebSetPayPasswordRequest) ProtoMessage() {} + +func (x *WebSetPayPasswordRequest) ProtoReflect() protoreflect.Message { + mi := &file_store_store_proto_msgTypes[22] + 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 WebSetPayPasswordRequest.ProtoReflect.Descriptor instead. +func (*WebSetPayPasswordRequest) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{22} +} + +func (x *WebSetPayPasswordRequest) GetPassword() string { + if x != nil { + return x.Password + } + return "" +} + +type WebStoreAddReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserMobile string `protobuf:"bytes,1,opt,name=user_mobile,json=userMobile,proto3" json:"user_mobile,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + District string `protobuf:"bytes,3,opt,name=district,proto3" json:"district,omitempty"` + DistrictIds string `protobuf:"bytes,4,opt,name=district_ids,json=districtIds,proto3" json:"district_ids,omitempty"` + Address string `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"` + IdCard string `protobuf:"bytes,6,opt,name=id_card,json=idCard,proto3" json:"id_card,omitempty"` + ConsigneeMobile string `protobuf:"bytes,7,opt,name=consignee_mobile,json=consigneeMobile,proto3" json:"consignee_mobile,omitempty"` + ConsigneeName string `protobuf:"bytes,8,opt,name=consignee_name,json=consigneeName,proto3" json:"consignee_name,omitempty"` + Receipt string `protobuf:"bytes,9,opt,name=receipt,proto3" json:"receipt,omitempty"` + BankInfo string `protobuf:"bytes,10,opt,name=bank_info,json=bankInfo,proto3" json:"bank_info,omitempty"` + Type int32 `protobuf:"varint,11,opt,name=type,proto3" json:"type,omitempty"` + Area string `protobuf:"bytes,12,opt,name=area,proto3" json:"area,omitempty"` + StoreImages string `protobuf:"bytes,13,opt,name=store_images,json=storeImages,proto3" json:"store_images,omitempty"` + UserName string `protobuf:"bytes,14,opt,name=user_name,json=userName,proto3" json:"user_name,omitempty"` + BusinessLicense string `protobuf:"bytes,15,opt,name=business_license,json=businessLicense,proto3" json:"business_license,omitempty"` + Images string `protobuf:"bytes,16,opt,name=images,proto3" json:"images,omitempty"` + Contact string `protobuf:"bytes,17,opt,name=contact,proto3" json:"contact,omitempty"` + Content string `protobuf:"bytes,18,opt,name=content,proto3" json:"content,omitempty"` + OpenTime string `protobuf:"bytes,19,opt,name=open_time,json=openTime,proto3" json:"open_time,omitempty"` + LongitudeWgs84 string `protobuf:"bytes,20,opt,name=longitude_wgs84,json=longitudeWgs84,proto3" json:"longitude_wgs84,omitempty"` + LatitudeWgs84 string `protobuf:"bytes,21,opt,name=latitude_wgs84,json=latitudeWgs84,proto3" json:"latitude_wgs84,omitempty"` + LongitudeGcj02 string `protobuf:"bytes,22,opt,name=longitude_gcj02,json=longitudeGcj02,proto3" json:"longitude_gcj02,omitempty"` + LatitudeGcj02 string `protobuf:"bytes,23,opt,name=latitude_gcj02,json=latitudeGcj02,proto3" json:"latitude_gcj02,omitempty"` + StoreType string `protobuf:"bytes,24,opt,name=store_type,json=storeType,proto3" json:"store_type,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *WebStoreAddReq) Reset() { + *x = WebStoreAddReq{} + mi := &file_store_store_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *WebStoreAddReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WebStoreAddReq) ProtoMessage() {} + +func (x *WebStoreAddReq) ProtoReflect() protoreflect.Message { + mi := &file_store_store_proto_msgTypes[23] + 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 WebStoreAddReq.ProtoReflect.Descriptor instead. +func (*WebStoreAddReq) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{23} +} + +func (x *WebStoreAddReq) GetUserMobile() string { + if x != nil { + return x.UserMobile + } + return "" +} + +func (x *WebStoreAddReq) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *WebStoreAddReq) GetDistrict() string { + if x != nil { + return x.District + } + return "" +} + +func (x *WebStoreAddReq) GetDistrictIds() string { + if x != nil { + return x.DistrictIds + } + return "" +} + +func (x *WebStoreAddReq) GetAddress() string { + if x != nil { + return x.Address + } + return "" +} + +func (x *WebStoreAddReq) GetIdCard() string { + if x != nil { + return x.IdCard + } + return "" +} + +func (x *WebStoreAddReq) GetConsigneeMobile() string { + if x != nil { + return x.ConsigneeMobile + } + return "" +} + +func (x *WebStoreAddReq) GetConsigneeName() string { + if x != nil { + return x.ConsigneeName + } + return "" +} + +func (x *WebStoreAddReq) GetReceipt() string { + if x != nil { + return x.Receipt + } + return "" +} + +func (x *WebStoreAddReq) GetBankInfo() string { + if x != nil { + return x.BankInfo + } + return "" +} + +func (x *WebStoreAddReq) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + +func (x *WebStoreAddReq) GetArea() string { + if x != nil { + return x.Area + } + return "" +} + +func (x *WebStoreAddReq) GetStoreImages() string { + if x != nil { + return x.StoreImages + } + return "" +} + +func (x *WebStoreAddReq) GetUserName() string { + if x != nil { + return x.UserName + } + return "" +} + +func (x *WebStoreAddReq) GetBusinessLicense() string { + if x != nil { + return x.BusinessLicense + } + return "" +} + +func (x *WebStoreAddReq) GetImages() string { + if x != nil { + return x.Images + } + return "" +} + +func (x *WebStoreAddReq) GetContact() string { + if x != nil { + return x.Contact + } + return "" +} + +func (x *WebStoreAddReq) GetContent() string { + if x != nil { + return x.Content + } + return "" +} + +func (x *WebStoreAddReq) GetOpenTime() string { + if x != nil { + return x.OpenTime + } + return "" +} + +func (x *WebStoreAddReq) GetLongitudeWgs84() string { + if x != nil { + return x.LongitudeWgs84 + } + return "" +} + +func (x *WebStoreAddReq) GetLatitudeWgs84() string { + if x != nil { + return x.LatitudeWgs84 + } + return "" +} + +func (x *WebStoreAddReq) GetLongitudeGcj02() string { + if x != nil { + return x.LongitudeGcj02 + } + return "" +} + +func (x *WebStoreAddReq) GetLatitudeGcj02() string { + if x != nil { + return x.LatitudeGcj02 + } + return "" +} + +func (x *WebStoreAddReq) GetStoreType() string { + if x != nil { + return x.StoreType + } + return "" +} + +type WebLowerStoreItemsReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Page int32 `protobuf:"varint,2,opt,name=page,proto3" json:"page,omitempty"` + Size int32 `protobuf:"varint,3,opt,name=size,proto3" json:"size,omitempty"` + SaleId int64 `protobuf:"varint,4,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *WebLowerStoreItemsReq) Reset() { + *x = WebLowerStoreItemsReq{} + mi := &file_store_store_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *WebLowerStoreItemsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WebLowerStoreItemsReq) ProtoMessage() {} + +func (x *WebLowerStoreItemsReq) ProtoReflect() protoreflect.Message { + mi := &file_store_store_proto_msgTypes[24] + 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 WebLowerStoreItemsReq.ProtoReflect.Descriptor instead. +func (*WebLowerStoreItemsReq) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{24} +} + +func (x *WebLowerStoreItemsReq) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *WebLowerStoreItemsReq) GetPage() int32 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *WebLowerStoreItemsReq) GetSize() int32 { + if x != nil { + return x.Size + } + return 0 +} + +func (x *WebLowerStoreItemsReq) GetSaleId() int64 { + if x != nil { + return x.SaleId + } + return 0 +} + var File_store_store_proto protoreflect.FileDescriptor const file_store_store_proto_rawDesc = "" + @@ -2059,7 +2399,42 @@ const file_store_store_proto_rawDesc = "" + "\x13ExcelExportResponse\x12\x12\n" + "\x04data\x18\x01 \x01(\fR\x04data\x12\x12\n" + "\x04name\x18\x02 \x01(\tR\x04name\x12\x10\n" + - "\x03msg\x18\x03 \x01(\tR\x03msg2\x9c\x13\n" + + "\x03msg\x18\x03 \x01(\tR\x03msg\"6\n" + + "\x18WebSetPayPasswordRequest\x12\x1a\n" + + "\bpassword\x18\x01 \x01(\tR\bpassword\"\xfb\x05\n" + + "\x0eWebStoreAddReq\x12\x1f\n" + + "\vuser_mobile\x18\x01 \x01(\tR\n" + + "userMobile\x12\x12\n" + + "\x04name\x18\x02 \x01(\tR\x04name\x12\x1a\n" + + "\bdistrict\x18\x03 \x01(\tR\bdistrict\x12!\n" + + "\fdistrict_ids\x18\x04 \x01(\tR\vdistrictIds\x12\x18\n" + + "\aaddress\x18\x05 \x01(\tR\aaddress\x12\x17\n" + + "\aid_card\x18\x06 \x01(\tR\x06idCard\x12)\n" + + "\x10consignee_mobile\x18\a \x01(\tR\x0fconsigneeMobile\x12%\n" + + "\x0econsignee_name\x18\b \x01(\tR\rconsigneeName\x12\x18\n" + + "\areceipt\x18\t \x01(\tR\areceipt\x12\x1b\n" + + "\tbank_info\x18\n" + + " \x01(\tR\bbankInfo\x12\x12\n" + + "\x04type\x18\v \x01(\x05R\x04type\x12\x12\n" + + "\x04area\x18\f \x01(\tR\x04area\x12!\n" + + "\fstore_images\x18\r \x01(\tR\vstoreImages\x12\x1b\n" + + "\tuser_name\x18\x0e \x01(\tR\buserName\x12)\n" + + "\x10business_license\x18\x0f \x01(\tR\x0fbusinessLicense\x12\x16\n" + + "\x06images\x18\x10 \x01(\tR\x06images\x12\x18\n" + + "\acontact\x18\x11 \x01(\tR\acontact\x12\x18\n" + + "\acontent\x18\x12 \x01(\tR\acontent\x12\x1b\n" + + "\topen_time\x18\x13 \x01(\tR\bopenTime\x12'\n" + + "\x0flongitude_wgs84\x18\x14 \x01(\tR\x0elongitudeWgs84\x12%\n" + + "\x0elatitude_wgs84\x18\x15 \x01(\tR\rlatitudeWgs84\x12'\n" + + "\x0flongitude_gcj02\x18\x16 \x01(\tR\x0elongitudeGcj02\x12%\n" + + "\x0elatitude_gcj02\x18\x17 \x01(\tR\rlatitudeGcj02\x12\x1d\n" + + "\n" + + "store_type\x18\x18 \x01(\tR\tstoreType\"l\n" + + "\x15WebLowerStoreItemsReq\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" + + "\x04page\x18\x02 \x01(\x05R\x04page\x12\x12\n" + + "\x04size\x18\x03 \x01(\x05R\x04size\x12\x17\n" + + "\asale_id\x18\x04 \x01(\x03R\x06saleId2\xdb\x17\n" + "\x05Store\x12R\n" + "\x06Status\x12\x14.store.StatusRequest\x1a\x0f.store.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/admin/v3/store/status\x12L\n" + "\x04Edit\x12\x12.store.EditRequest\x1a\x0f.store.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/admin/v3/store/edit\x12R\n" + @@ -2085,7 +2460,13 @@ const file_store_store_proto_rawDesc = "" + "\x0eDepositRecover\x12\x10.store.IdRequest\x1a\x0f.store.Response\"*\x82\xd3\xe4\x93\x02$:\x01*\x12\x1f/admin/v3/store/deposit/recover\x12n\n" + "\x0fDepositBackfill\x12\x1d.store.DepositBackfillRequest\x1a\x0f.store.Response\"+\x82\xd3\xe4\x93\x02%:\x01*\x12 /admin/v3/store/deposit/backfill\x12l\n" + "\x10WebDepositCreate\x12\x1e.store.WebDepositCreateRequest\x1a\x0f.store.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/api/v3/store/deposit/create\x12i\n" + - "\x0fWebDepositItems\x12\x1d.store.WebDepositItemsRequest\x1a\x0f.store.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/api/v3/store/deposit/items\x12.\n" + + "\x0fWebDepositItems\x12\x1d.store.WebDepositItemsRequest\x1a\x0f.store.Response\"&\x82\xd3\xe4\x93\x02 :\x01*\x12\x1b/api/v3/store/deposit/items\x12h\n" + + "\x13WebCheckPayPassword\x12\x13.store.EmptyRequest\x1a\x0f.store.Response\"+\x82\xd3\xe4\x93\x02%:\x01*\x12 /api/v3/store/pay/check/password\x12p\n" + + "\x11WebSetPayPassword\x12\x1f.store.WebSetPayPasswordRequest\x1a\x0f.store.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/api/v3/store/pay/set/password\x12W\n" + + "\vWebPayMoney\x12\x13.store.EmptyRequest\x1a\x0f.store.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/api/v3/store/pay/money\x12N\n" + + "\aWebInfo\x12\x13.store.EmptyRequest\x1a\x0f.store.Response\"\x1d\x82\xd3\xe4\x93\x02\x17:\x01*\x12\x12/api/v3/store/info\x12c\n" + + "\x12WebLowerStoreItems\x12\x1c.store.WebLowerStoreItemsReq\x1a\x0f.store.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\x1a\x13/api/v3/store/lower\x12S\n" + + "\vWebStoreAdd\x12\x15.store.WebStoreAddReq\x1a\x0f.store.Response\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\x1a\x11/api/v3/store/add\x12.\n" + "\x06SetDef\x12\x13.store.EmptyRequest\x1a\x0f.store.Response\x124\n" + "\vGetInfoById\x12\x10.store.IdRequest\x1a\x13.store.InfoResponse\x127\n" + "\fGetInfoByIds\x12\x11.store.IdsRequest\x1a\x14.store.ItemsResponseB\tZ\a./storeb\x06proto3" @@ -2102,30 +2483,33 @@ func file_store_store_proto_rawDescGZIP() []byte { return file_store_store_proto_rawDescData } -var file_store_store_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_store_store_proto_msgTypes = make([]protoimpl.MessageInfo, 25) var file_store_store_proto_goTypes = []any{ - (*EmptyRequest)(nil), // 0: store.EmptyRequest - (*IdRequest)(nil), // 1: store.IdRequest - (*IdsRequest)(nil), // 2: store.IdsRequest - (*StatusRequest)(nil), // 3: store.StatusRequest - (*Response)(nil), // 4: store.Response - (*EditRequest)(nil), // 5: store.EditRequest - (*CreateRequest)(nil), // 6: store.CreateRequest - (*InfoResponse)(nil), // 7: store.InfoResponse - (*ItemsResponse)(nil), // 8: store.ItemsResponse - (*ToSaleRequest)(nil), // 9: store.ToSaleRequest - (*ContentRequest)(nil), // 10: store.ContentRequest - (*ItemsRequest)(nil), // 11: store.ItemsRequest - (*VerifyItemsRequest)(nil), // 12: store.VerifyItemsRequest - (*VerifyEditRequest)(nil), // 13: store.VerifyEditRequest - (*ApplyEditRequest)(nil), // 14: store.ApplyEditRequest - (*DepositItemsRequest)(nil), // 15: store.DepositItemsRequest - (*DepositVerifyRequest)(nil), // 16: store.DepositVerifyRequest - (*DepositIgnoreRequest)(nil), // 17: store.DepositIgnoreRequest - (*DepositBackfillRequest)(nil), // 18: store.DepositBackfillRequest - (*WebDepositCreateRequest)(nil), // 19: store.WebDepositCreateRequest - (*WebDepositItemsRequest)(nil), // 20: store.WebDepositItemsRequest - (*ExcelExportResponse)(nil), // 21: store.ExcelExportResponse + (*EmptyRequest)(nil), // 0: store.EmptyRequest + (*IdRequest)(nil), // 1: store.IdRequest + (*IdsRequest)(nil), // 2: store.IdsRequest + (*StatusRequest)(nil), // 3: store.StatusRequest + (*Response)(nil), // 4: store.Response + (*EditRequest)(nil), // 5: store.EditRequest + (*CreateRequest)(nil), // 6: store.CreateRequest + (*InfoResponse)(nil), // 7: store.InfoResponse + (*ItemsResponse)(nil), // 8: store.ItemsResponse + (*ToSaleRequest)(nil), // 9: store.ToSaleRequest + (*ContentRequest)(nil), // 10: store.ContentRequest + (*ItemsRequest)(nil), // 11: store.ItemsRequest + (*VerifyItemsRequest)(nil), // 12: store.VerifyItemsRequest + (*VerifyEditRequest)(nil), // 13: store.VerifyEditRequest + (*ApplyEditRequest)(nil), // 14: store.ApplyEditRequest + (*DepositItemsRequest)(nil), // 15: store.DepositItemsRequest + (*DepositVerifyRequest)(nil), // 16: store.DepositVerifyRequest + (*DepositIgnoreRequest)(nil), // 17: store.DepositIgnoreRequest + (*DepositBackfillRequest)(nil), // 18: store.DepositBackfillRequest + (*WebDepositCreateRequest)(nil), // 19: store.WebDepositCreateRequest + (*WebDepositItemsRequest)(nil), // 20: store.WebDepositItemsRequest + (*ExcelExportResponse)(nil), // 21: store.ExcelExportResponse + (*WebSetPayPasswordRequest)(nil), // 22: store.WebSetPayPasswordRequest + (*WebStoreAddReq)(nil), // 23: store.WebStoreAddReq + (*WebLowerStoreItemsReq)(nil), // 24: store.WebLowerStoreItemsReq } var file_store_store_proto_depIdxs = []int32{ 7, // 0: store.ItemsResponse.items:type_name -> store.InfoResponse @@ -2153,38 +2537,50 @@ var file_store_store_proto_depIdxs = []int32{ 18, // 22: store.Store.DepositBackfill:input_type -> store.DepositBackfillRequest 19, // 23: store.Store.WebDepositCreate:input_type -> store.WebDepositCreateRequest 20, // 24: store.Store.WebDepositItems:input_type -> store.WebDepositItemsRequest - 0, // 25: store.Store.SetDef:input_type -> store.EmptyRequest - 1, // 26: store.Store.GetInfoById:input_type -> store.IdRequest - 2, // 27: store.Store.GetInfoByIds:input_type -> store.IdsRequest - 4, // 28: store.Store.Status:output_type -> store.Response - 4, // 29: store.Store.Edit:output_type -> store.Response - 4, // 30: store.Store.Create:output_type -> store.Response - 4, // 31: store.Store.ToSale:output_type -> store.Response - 4, // 32: store.Store.Info:output_type -> store.Response - 4, // 33: store.Store.Content:output_type -> store.Response - 4, // 34: store.Store.Names:output_type -> store.Response - 4, // 35: store.Store.Items:output_type -> store.Response - 4, // 36: store.Store.VerifyItems:output_type -> store.Response - 4, // 37: store.Store.VerifyStatus:output_type -> store.Response - 4, // 38: store.Store.VerifyEdit:output_type -> store.Response - 4, // 39: store.Store.ApplyEdit:output_type -> store.Response - 4, // 40: store.Store.ApplyVerify:output_type -> store.Response - 4, // 41: store.Store.ApplyVerifyStatus:output_type -> store.Response - 4, // 42: store.Store.DepositDone:output_type -> store.Response - 4, // 43: store.Store.DepositIgnore:output_type -> store.Response - 4, // 44: store.Store.DepositVerify:output_type -> store.Response - 21, // 45: store.Store.DepositDown:output_type -> store.ExcelExportResponse - 4, // 46: store.Store.DepositItems:output_type -> store.Response - 4, // 47: store.Store.DepositIgnoreItems:output_type -> store.Response - 4, // 48: store.Store.DepositRecover:output_type -> store.Response - 4, // 49: store.Store.DepositBackfill:output_type -> store.Response - 4, // 50: store.Store.WebDepositCreate:output_type -> store.Response - 4, // 51: store.Store.WebDepositItems:output_type -> store.Response - 4, // 52: store.Store.SetDef:output_type -> store.Response - 7, // 53: store.Store.GetInfoById:output_type -> store.InfoResponse - 8, // 54: store.Store.GetInfoByIds:output_type -> store.ItemsResponse - 28, // [28:55] is the sub-list for method output_type - 1, // [1:28] is the sub-list for method input_type + 0, // 25: store.Store.WebCheckPayPassword:input_type -> store.EmptyRequest + 22, // 26: store.Store.WebSetPayPassword:input_type -> store.WebSetPayPasswordRequest + 0, // 27: store.Store.WebPayMoney:input_type -> store.EmptyRequest + 0, // 28: store.Store.WebInfo:input_type -> store.EmptyRequest + 24, // 29: store.Store.WebLowerStoreItems:input_type -> store.WebLowerStoreItemsReq + 23, // 30: store.Store.WebStoreAdd:input_type -> store.WebStoreAddReq + 0, // 31: store.Store.SetDef:input_type -> store.EmptyRequest + 1, // 32: store.Store.GetInfoById:input_type -> store.IdRequest + 2, // 33: store.Store.GetInfoByIds:input_type -> store.IdsRequest + 4, // 34: store.Store.Status:output_type -> store.Response + 4, // 35: store.Store.Edit:output_type -> store.Response + 4, // 36: store.Store.Create:output_type -> store.Response + 4, // 37: store.Store.ToSale:output_type -> store.Response + 4, // 38: store.Store.Info:output_type -> store.Response + 4, // 39: store.Store.Content:output_type -> store.Response + 4, // 40: store.Store.Names:output_type -> store.Response + 4, // 41: store.Store.Items:output_type -> store.Response + 4, // 42: store.Store.VerifyItems:output_type -> store.Response + 4, // 43: store.Store.VerifyStatus:output_type -> store.Response + 4, // 44: store.Store.VerifyEdit:output_type -> store.Response + 4, // 45: store.Store.ApplyEdit:output_type -> store.Response + 4, // 46: store.Store.ApplyVerify:output_type -> store.Response + 4, // 47: store.Store.ApplyVerifyStatus:output_type -> store.Response + 4, // 48: store.Store.DepositDone:output_type -> store.Response + 4, // 49: store.Store.DepositIgnore:output_type -> store.Response + 4, // 50: store.Store.DepositVerify:output_type -> store.Response + 21, // 51: store.Store.DepositDown:output_type -> store.ExcelExportResponse + 4, // 52: store.Store.DepositItems:output_type -> store.Response + 4, // 53: store.Store.DepositIgnoreItems:output_type -> store.Response + 4, // 54: store.Store.DepositRecover:output_type -> store.Response + 4, // 55: store.Store.DepositBackfill:output_type -> store.Response + 4, // 56: store.Store.WebDepositCreate:output_type -> store.Response + 4, // 57: store.Store.WebDepositItems:output_type -> store.Response + 4, // 58: store.Store.WebCheckPayPassword:output_type -> store.Response + 4, // 59: store.Store.WebSetPayPassword:output_type -> store.Response + 4, // 60: store.Store.WebPayMoney:output_type -> store.Response + 4, // 61: store.Store.WebInfo:output_type -> store.Response + 4, // 62: store.Store.WebLowerStoreItems:output_type -> store.Response + 4, // 63: store.Store.WebStoreAdd:output_type -> store.Response + 4, // 64: store.Store.SetDef:output_type -> store.Response + 7, // 65: store.Store.GetInfoById:output_type -> store.InfoResponse + 8, // 66: store.Store.GetInfoByIds:output_type -> store.ItemsResponse + 34, // [34:67] is the sub-list for method output_type + 1, // [1:34] 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 @@ -2201,7 +2597,7 @@ func file_store_store_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_store_proto_rawDesc), len(file_store_store_proto_rawDesc)), NumEnums: 0, - NumMessages: 22, + NumMessages: 25, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/store/pb/store_grpc.pb.go b/rpc/store/pb/store_grpc.pb.go index f258d0e..43b467f 100644 --- a/rpc/store/pb/store_grpc.pb.go +++ b/rpc/store/pb/store_grpc.pb.go @@ -19,33 +19,39 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Store_Status_FullMethodName = "/store.Store/Status" - Store_Edit_FullMethodName = "/store.Store/Edit" - Store_Create_FullMethodName = "/store.Store/Create" - Store_ToSale_FullMethodName = "/store.Store/ToSale" - Store_Info_FullMethodName = "/store.Store/Info" - Store_Content_FullMethodName = "/store.Store/Content" - Store_Names_FullMethodName = "/store.Store/Names" - Store_Items_FullMethodName = "/store.Store/Items" - Store_VerifyItems_FullMethodName = "/store.Store/VerifyItems" - Store_VerifyStatus_FullMethodName = "/store.Store/VerifyStatus" - Store_VerifyEdit_FullMethodName = "/store.Store/VerifyEdit" - Store_ApplyEdit_FullMethodName = "/store.Store/ApplyEdit" - Store_ApplyVerify_FullMethodName = "/store.Store/ApplyVerify" - Store_ApplyVerifyStatus_FullMethodName = "/store.Store/ApplyVerifyStatus" - Store_DepositDone_FullMethodName = "/store.Store/DepositDone" - Store_DepositIgnore_FullMethodName = "/store.Store/DepositIgnore" - Store_DepositVerify_FullMethodName = "/store.Store/DepositVerify" - Store_DepositDown_FullMethodName = "/store.Store/DepositDown" - Store_DepositItems_FullMethodName = "/store.Store/DepositItems" - Store_DepositIgnoreItems_FullMethodName = "/store.Store/DepositIgnoreItems" - Store_DepositRecover_FullMethodName = "/store.Store/DepositRecover" - Store_DepositBackfill_FullMethodName = "/store.Store/DepositBackfill" - Store_WebDepositCreate_FullMethodName = "/store.Store/WebDepositCreate" - Store_WebDepositItems_FullMethodName = "/store.Store/WebDepositItems" - Store_SetDef_FullMethodName = "/store.Store/SetDef" - Store_GetInfoById_FullMethodName = "/store.Store/GetInfoById" - Store_GetInfoByIds_FullMethodName = "/store.Store/GetInfoByIds" + Store_Status_FullMethodName = "/store.Store/Status" + Store_Edit_FullMethodName = "/store.Store/Edit" + Store_Create_FullMethodName = "/store.Store/Create" + Store_ToSale_FullMethodName = "/store.Store/ToSale" + Store_Info_FullMethodName = "/store.Store/Info" + Store_Content_FullMethodName = "/store.Store/Content" + Store_Names_FullMethodName = "/store.Store/Names" + Store_Items_FullMethodName = "/store.Store/Items" + Store_VerifyItems_FullMethodName = "/store.Store/VerifyItems" + Store_VerifyStatus_FullMethodName = "/store.Store/VerifyStatus" + Store_VerifyEdit_FullMethodName = "/store.Store/VerifyEdit" + Store_ApplyEdit_FullMethodName = "/store.Store/ApplyEdit" + Store_ApplyVerify_FullMethodName = "/store.Store/ApplyVerify" + Store_ApplyVerifyStatus_FullMethodName = "/store.Store/ApplyVerifyStatus" + Store_DepositDone_FullMethodName = "/store.Store/DepositDone" + Store_DepositIgnore_FullMethodName = "/store.Store/DepositIgnore" + Store_DepositVerify_FullMethodName = "/store.Store/DepositVerify" + Store_DepositDown_FullMethodName = "/store.Store/DepositDown" + Store_DepositItems_FullMethodName = "/store.Store/DepositItems" + Store_DepositIgnoreItems_FullMethodName = "/store.Store/DepositIgnoreItems" + Store_DepositRecover_FullMethodName = "/store.Store/DepositRecover" + Store_DepositBackfill_FullMethodName = "/store.Store/DepositBackfill" + Store_WebDepositCreate_FullMethodName = "/store.Store/WebDepositCreate" + Store_WebDepositItems_FullMethodName = "/store.Store/WebDepositItems" + Store_WebCheckPayPassword_FullMethodName = "/store.Store/WebCheckPayPassword" + Store_WebSetPayPassword_FullMethodName = "/store.Store/WebSetPayPassword" + Store_WebPayMoney_FullMethodName = "/store.Store/WebPayMoney" + Store_WebInfo_FullMethodName = "/store.Store/WebInfo" + Store_WebLowerStoreItems_FullMethodName = "/store.Store/WebLowerStoreItems" + Store_WebStoreAdd_FullMethodName = "/store.Store/WebStoreAdd" + Store_SetDef_FullMethodName = "/store.Store/SetDef" + Store_GetInfoById_FullMethodName = "/store.Store/GetInfoById" + Store_GetInfoByIds_FullMethodName = "/store.Store/GetInfoByIds" ) // StoreClient is the client API for Store service. @@ -76,6 +82,12 @@ type StoreClient interface { DepositBackfill(ctx context.Context, in *DepositBackfillRequest, opts ...grpc.CallOption) (*Response, error) WebDepositCreate(ctx context.Context, in *WebDepositCreateRequest, opts ...grpc.CallOption) (*Response, error) WebDepositItems(ctx context.Context, in *WebDepositItemsRequest, opts ...grpc.CallOption) (*Response, error) + WebCheckPayPassword(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) + WebSetPayPassword(ctx context.Context, in *WebSetPayPasswordRequest, opts ...grpc.CallOption) (*Response, error) + WebPayMoney(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) + WebInfo(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) + WebLowerStoreItems(ctx context.Context, in *WebLowerStoreItemsReq, opts ...grpc.CallOption) (*Response, error) + WebStoreAdd(ctx context.Context, in *WebStoreAddReq, opts ...grpc.CallOption) (*Response, error) SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) GetInfoById(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*InfoResponse, error) GetInfoByIds(ctx context.Context, in *IdsRequest, opts ...grpc.CallOption) (*ItemsResponse, error) @@ -329,6 +341,66 @@ func (c *storeClient) WebDepositItems(ctx context.Context, in *WebDepositItemsRe return out, nil } +func (c *storeClient) WebCheckPayPassword(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Store_WebCheckPayPassword_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) WebSetPayPassword(ctx context.Context, in *WebSetPayPasswordRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Store_WebSetPayPassword_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) WebPayMoney(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Store_WebPayMoney_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) WebInfo(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Store_WebInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) WebLowerStoreItems(ctx context.Context, in *WebLowerStoreItemsReq, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Store_WebLowerStoreItems_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) WebStoreAdd(ctx context.Context, in *WebStoreAddReq, opts ...grpc.CallOption) (*Response, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(Response) + err := c.cc.Invoke(ctx, Store_WebStoreAdd_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *storeClient) SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -387,6 +459,12 @@ type StoreServer interface { DepositBackfill(context.Context, *DepositBackfillRequest) (*Response, error) WebDepositCreate(context.Context, *WebDepositCreateRequest) (*Response, error) WebDepositItems(context.Context, *WebDepositItemsRequest) (*Response, error) + WebCheckPayPassword(context.Context, *EmptyRequest) (*Response, error) + WebSetPayPassword(context.Context, *WebSetPayPasswordRequest) (*Response, error) + WebPayMoney(context.Context, *EmptyRequest) (*Response, error) + WebInfo(context.Context, *EmptyRequest) (*Response, error) + WebLowerStoreItems(context.Context, *WebLowerStoreItemsReq) (*Response, error) + WebStoreAdd(context.Context, *WebStoreAddReq) (*Response, error) SetDef(context.Context, *EmptyRequest) (*Response, error) GetInfoById(context.Context, *IdRequest) (*InfoResponse, error) GetInfoByIds(context.Context, *IdsRequest) (*ItemsResponse, error) @@ -472,6 +550,24 @@ func (UnimplementedStoreServer) WebDepositCreate(context.Context, *WebDepositCre func (UnimplementedStoreServer) WebDepositItems(context.Context, *WebDepositItemsRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method WebDepositItems not implemented") } +func (UnimplementedStoreServer) WebCheckPayPassword(context.Context, *EmptyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WebCheckPayPassword not implemented") +} +func (UnimplementedStoreServer) WebSetPayPassword(context.Context, *WebSetPayPasswordRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WebSetPayPassword not implemented") +} +func (UnimplementedStoreServer) WebPayMoney(context.Context, *EmptyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WebPayMoney not implemented") +} +func (UnimplementedStoreServer) WebInfo(context.Context, *EmptyRequest) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WebInfo not implemented") +} +func (UnimplementedStoreServer) WebLowerStoreItems(context.Context, *WebLowerStoreItemsReq) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WebLowerStoreItems not implemented") +} +func (UnimplementedStoreServer) WebStoreAdd(context.Context, *WebStoreAddReq) (*Response, error) { + return nil, status.Error(codes.Unimplemented, "method WebStoreAdd not implemented") +} func (UnimplementedStoreServer) SetDef(context.Context, *EmptyRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method SetDef not implemented") } @@ -934,6 +1030,114 @@ func _Store_WebDepositItems_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } +func _Store_WebCheckPayPassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmptyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).WebCheckPayPassword(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_WebCheckPayPassword_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).WebCheckPayPassword(ctx, req.(*EmptyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_WebSetPayPassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WebSetPayPasswordRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).WebSetPayPassword(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_WebSetPayPassword_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).WebSetPayPassword(ctx, req.(*WebSetPayPasswordRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_WebPayMoney_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmptyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).WebPayMoney(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_WebPayMoney_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).WebPayMoney(ctx, req.(*EmptyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_WebInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(EmptyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).WebInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_WebInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).WebInfo(ctx, req.(*EmptyRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_WebLowerStoreItems_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WebLowerStoreItemsReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).WebLowerStoreItems(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_WebLowerStoreItems_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).WebLowerStoreItems(ctx, req.(*WebLowerStoreItemsReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_WebStoreAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WebStoreAddReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).WebStoreAdd(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_WebStoreAdd_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).WebStoreAdd(ctx, req.(*WebStoreAddReq)) + } + return interceptor(ctx, in, info, handler) +} + func _Store_SetDef_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(EmptyRequest) if err := dec(in); err != nil { @@ -1091,6 +1295,30 @@ var Store_ServiceDesc = grpc.ServiceDesc{ MethodName: "WebDepositItems", Handler: _Store_WebDepositItems_Handler, }, + { + MethodName: "WebCheckPayPassword", + Handler: _Store_WebCheckPayPassword_Handler, + }, + { + MethodName: "WebSetPayPassword", + Handler: _Store_WebSetPayPassword_Handler, + }, + { + MethodName: "WebPayMoney", + Handler: _Store_WebPayMoney_Handler, + }, + { + MethodName: "WebInfo", + Handler: _Store_WebInfo_Handler, + }, + { + MethodName: "WebLowerStoreItems", + Handler: _Store_WebLowerStoreItems_Handler, + }, + { + MethodName: "WebStoreAdd", + Handler: _Store_WebStoreAdd_Handler, + }, { MethodName: "SetDef", Handler: _Store_SetDef_Handler, diff --git a/rpc/store/store.pb b/rpc/store/store.pb index 86b05603066286790fbcd7ece72f705809f9c135..8c505771adbd274e6c9960a850a3ab7b06499608 100644 GIT binary patch delta 842 zcmZuv&rcIU7|o#c$82fs)V9;53ap2sht}A*NE71^qDcdorWiPpX4oBN1KnMB7fDYT z63@nbM-SdSlMw#^&PEf%(IaxvKf%N}Gexk)%Vg$#@4fHa@9pk8bo>GB9o0u(-P=E| z|IExACZ;QVZHY%M)@!ja-1Y*y&0lQsFd{lm_$LrWlW02GK7AX%MsZpSBQM|&Y$<{0 z&YM&b#~r(4vB0J=IGCM6aX6ZtMhQqYCU%m_BOY*zJAOpQadM5h8y&}e=26`Dmq1gz z3Bebmp3kW!@X@xqON<4a(Ujt6of%3TrAz_Sp(~(22RM%V`?! zn%7VUm^rCmQsh`)N+^z7o*OYMqFH#`C?Nu0%yE>1AEtpW!`Ms(<>9tC3$QBABD|h4 zu2W@^RQ;ZcfsIX^7kgRowt1kI(~NjGlWB;UAXnFxPLhJJ5gB2Il-P= z=hntQ0l?Qs75Fr-wS1@cvR+f>HJ|lrmL!T>Kc@z|L42G&mmis^DoOQR1#Uhr!Cq6V z4jYF&8n9i#nh=YT7Co2uM utils.NumberZero { + mobile, dErr := utils.DecryptPhone(info.UserMobile) + if dErr == nil { + info.UserMobile = utils.DecryptPhoneReplace(mobile) + } + } + return l.ok(info) +} diff --git a/services/store/internal/logic/webLowerStoreItemsLogic.go b/services/store/internal/logic/webLowerStoreItemsLogic.go new file mode 100644 index 0000000..fb0608f --- /dev/null +++ b/services/store/internal/logic/webLowerStoreItemsLogic.go @@ -0,0 +1,125 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + chore "lone-services/rpc/chore/pb" + "lone-services/services/store/internal/dao" + "lone-services/services/store/internal/model" + "lone-services/services/store/validator" + "strconv" + "strings" + + "lone-services/rpc/store/pb" + "lone-services/services/store/internal/svc" + + "github.com/samber/lo" + "github.com/zeromicro/go-zero/core/logx" +) + +type WebLowerStoreItemsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewWebLowerStoreItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WebLowerStoreItemsLogic { + return &WebLowerStoreItemsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *WebLowerStoreItemsLogic) WebLowerStoreItems(in *store.WebLowerStoreItemsReq) (*store.Response, error) { + var v validator.ApiStoreItemsValidator + 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) + } + if adminInfo.Type != dao.LoginTypeSale { + return l.fail(utils.ErrorNoLogin) + } + + saleId := adminInfo.ID + if in.SaleId > utils.NumberZero { + saleId = in.SaleId + } + var info []dao.StoreWebInfo + w := modelbase.Params{ + Page: int(in.Page), + Size: int(in.Size), + Order: "id desc", + Eq: map[string]string{"sale_id": strconv.FormatInt(saleId, utils.NumberTen)}, + In: map[string][]string{"status": {utils.StringStatusOk, utils.StatusForbiddenString, strconv.Itoa(int(utils.StatusWaitPass))}}, + } + w.Like = make(map[string]string) + if len(v.Name) > utils.NumberZero { + w.Like["name LIKE ? "] = "%%" + v.Name + "%%" + } + + items, err := model.StoreModel{}.Init().Page(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + l.setArea(&info) + + items.Items = info + return l.ok(items) +} + +func (l *WebLowerStoreItemsLogic) setArea(info *[]dao.StoreWebInfo) { + var ids []int64 + for key, v := range *info { + mobile, aErr := utils.DecryptPhone(v.UserMobile) + if aErr == nil { + (*info)[key].UserMobile = mobile + } + strArr := strings.Split(v.District, utils.DecollatorComma) + for _, s := range strArr { + num, err := strconv.ParseInt(strings.TrimSpace(s), utils.NumberTen, utils.NumberSixtyFourth) + if err == nil { + ids = append(ids, num) + } + } + } + + newIds := lo.Uniq(ids) + if len(newIds) > utils.NumberZero { + cli, err := svc.GetRpcClient(l.svcCtx.ChoreName) + if err != nil { + logx.Errorf("get chore err: %v", err) + return + } + + client := chore.NewChoreClient(cli.Conn()) + + regions, err := client.RegionsByIds(context.Background(), &chore.RegionsByIdsReq{ + Ids: newIds, + }) + if err != nil { + logx.Errorf("get chore err: %v", err) + return + } + + areaMap := make(map[string]string) + for _, item := range regions.Items { + areaMap[strconv.Itoa(int(item.Id))] = item.Name + } + + for key, item := range *info { + for _, id := range strings.Split(item.District, utils.DecollatorComma) { + if m, ok := areaMap[id]; ok { + (*info)[key].DistrictNames = (*info)[key].DistrictNames + " " + m + } + } + } + } +} diff --git a/services/store/internal/logic/webPayMoneyLogic.go b/services/store/internal/logic/webPayMoneyLogic.go new file mode 100644 index 0000000..cd20c39 --- /dev/null +++ b/services/store/internal/logic/webPayMoneyLogic.go @@ -0,0 +1,50 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/store/internal/dao" + "lone-services/services/store/internal/model" + "strconv" + + "lone-services/rpc/store/pb" + "lone-services/services/store/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type WebPayMoneyLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewWebPayMoneyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WebPayMoneyLogic { + return &WebPayMoneyLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *WebPayMoneyLogic) WebPayMoney(in *store.EmptyRequest) (*store.Response, error) { + adminInfo := utils.GetUserFromCtx(l.ctx) + if adminInfo.ID < utils.NumberOne { + return l.fail(utils.ErrorNoLoginInfo) + } + var info dao.StoreInfo + modelObj := model.StoreModel{}.Init() + w := modelbase.Params{Eq: map[string]string{"id": strconv.FormatInt(adminInfo.ID, utils.NumberTen)}} + err := modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.ErrorNotFund) + } + + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + return l.ok(info.BuyAmount) +} diff --git a/services/store/internal/logic/webSetPayPasswordLogic.go b/services/store/internal/logic/webSetPayPasswordLogic.go new file mode 100644 index 0000000..066dfb6 --- /dev/null +++ b/services/store/internal/logic/webSetPayPasswordLogic.go @@ -0,0 +1,65 @@ +package logic + +import ( + "context" + "lone-services/pkg/modelbase" + "lone-services/pkg/utils" + "lone-services/services/store/internal/dao" + "lone-services/services/store/internal/model" + "lone-services/services/store/validator" + "strconv" + + "lone-services/rpc/store/pb" + "lone-services/services/store/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" +) + +type WebSetPayPasswordLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +func NewWebSetPayPasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WebSetPayPasswordLogic { + return &WebSetPayPasswordLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *WebSetPayPasswordLogic) WebSetPayPassword(in *store.WebSetPayPasswordRequest) (*store.Response, error) { + var v validator.WebSetPasswordValidator + 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) + } + + var info dao.StoreWebPassword + w := modelbase.Params{Eq: map[string]string{"id": strconv.FormatInt(adminInfo.ID, utils.NumberTen)}} + modelObj := model.StoreModel{}.Init() + err := modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + info.PayPassword = utils.MD5Encrypt(in.Password) + _, err = modelObj.Edit(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + return l.ok(utils.NumberOne) +} diff --git a/services/store/internal/logic/webStoreAddLogic.go b/services/store/internal/logic/webStoreAddLogic.go new file mode 100644 index 0000000..6deec49 --- /dev/null +++ b/services/store/internal/logic/webStoreAddLogic.go @@ -0,0 +1,263 @@ +package logic + +import ( + "context" + "lone-services/pkg/utils" + "lone-services/pkg/wecomrpc" + chore "lone-services/rpc/chore/pb" + sale "lone-services/rpc/sale/pb" + "lone-services/rpc/store/pb" + user "lone-services/rpc/user/pb" + "lone-services/services/store/internal/dao" + "lone-services/services/store/internal/model" + "lone-services/services/store/internal/svc" + "lone-services/services/store/validator" + "strconv" + "strings" + + "github.com/zeromicro/go-zero/core/logx" +) + +type WebStoreAddLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger + BaseLogic +} + +type areaNames struct { + ProvinceId int64 `json:"province_id"` + ProvinceName string `json:"province_name"` + CityId int64 `json:"city_id"` + CityName string `json:"city_name"` + CountyId int64 `json:"county_id"` + CountyName string `json:"county_name"` +} + +func NewWebStoreAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WebStoreAddLogic { + return &WebStoreAddLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *WebStoreAddLogic) WebStoreAdd(in *store.WebStoreAddReq) (*store.Response, error) { + var v validator.ApiStoreCreateValidator + 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) + } + + uErr := l.checkUser(in.UserMobile) + if uErr != utils.Ok { + return l.fail(uErr) + } + + encryptMobile, cErr := utils.EncryptPhone(v.UserMobile) + if cErr != nil { + return l.fail(utils.SetError(utils.Fail, cErr.GetMsg())) + } + + encryptData, cErr := utils.Crypto{}.AESEncryptECB(v.BusinessLicense) + if cErr != nil { + return l.fail(utils.SetError(utils.Fail, cErr.GetMsg())) + } + + encryptIdCard, cErr := utils.Crypto{}.AESEncryptECB(v.IdCard) + if cErr != nil { + return l.fail(utils.SetError(utils.Fail, cErr.GetMsg())) + } + + l.Logger.Error(1111111) + groupId, sErr := l.getSaleInfo(adminInfo.ID) + if sErr != utils.Ok { + return l.fail(sErr) + } + if groupId < utils.NumberOne { + return l.fail(utils.ErrorNotFund) + } + + areas, sErr := l.getAreaInfo(v.DistrictIds) + if sErr != utils.Ok { + return l.fail(sErr) + } + + data := dao.StoreCreate{ + UserName: v.UserName, + SourceType: dao.StoreTypeSales, + Images: v.Images, + Contact: v.Contact, + Content: v.Content, + OpenTime: v.OpenTime, + LongitudeWgs84: v.LongitudeWgs84, + LatitudeWgs84: v.LatitudeWgs84, + LongitudeGcj02: v.LongitudeGcj02, + LatitudeGcj02: v.LatitudeGcj02, + SaleId: adminInfo.ID, + UserMobile: encryptMobile, + Name: v.Name, + BankInfo: v.BankInfo, + BusinessLicense: encryptData, + District: v.DistrictIds, + Address: v.Address, + GroupId: groupId, + Status: utils.StatusWaitPass, + StoreImages: v.StoreImages, + IdCard: encryptIdCard, + Area: v.Area, + Receipt: v.Receipt, + Type: v.Type, + Province: areas.ProvinceId, + ProvinceName: areas.ProvinceName, + City: areas.CityId, + CityName: areas.CityName, + County: areas.CountyId, + CountyName: areas.CountyName, + } + + modelObj := model.StoreModel{}.Init() + modelObj.Begin() + + err := modelObj.Create(&data) + if err != nil { + modelObj.Rollback() + l.Logger.Error(err) + return l.fail(utils.Fail) + } + + uErr = l.createUser(data, in.UserMobile, utils.GetRandString(utils.NumberFive)) + if uErr != utils.Ok { + modelObj.Rollback() + return l.fail(uErr) + } + modelObj.Commit() + + wecomrpc.SendMessage(l.ctx, l.svcCtx.WeComName, wecomrpc.SendMessageJob{ + BizId: int(data.Id), // 门店ID + BizType: wecomrpc.BizTypeStore, + Type: wecomrpc.ProductSubmitReview, + }) + + modelObj.Commit() + return l.ok(utils.NumberOne) +} + +func (l *WebStoreAddLogic) checkUser(mobile string) utils.Status { + cli, err := svc.GetRpcClient(l.svcCtx.UserName) + if err != nil { + logx.Errorf("get user err: %v", err) + return utils.ErrorInternalServer + } + + client := user.NewUserClient(cli.Conn()) + + data := user.InternalCheckCreateReq{ + Mobile: mobile, + } + _, err = client.InternalCheckCreate(context.Background(), &data) + if err != nil { + logx.Errorf("get order err: %v", err) + return utils.ErrorInternalServer + } + + return utils.Ok +} + +func (l *WebStoreAddLogic) getSaleInfo(id int64) (int64, utils.Status) { + cli, err := svc.GetRpcClient(l.svcCtx.SaleName) + if err != nil { + logx.Errorf("get order err: %v", err) + return utils.NumberZero, utils.ErrorInternalServer + } + + client := sale.NewSaleClient(cli.Conn()) + w := sale.InfoReq{Id: id} + info, err := client.InfoInternal(context.Background(), &w) + if err != nil { + logx.Errorf("get sale err: %v", err) + return utils.NumberZero, utils.ErrorInternalServer + } + return info.GroupId, utils.Ok +} + +func (l *WebStoreAddLogic) getAreaInfo(DistrictIds string) (areaNames, utils.Status) { + var areas areaNames + var ids []int64 + strArr := strings.Split(DistrictIds, utils.DecollatorComma) + for _, s := range strArr { + num, err := strconv.ParseInt(strings.TrimSpace(s), utils.NumberTen, utils.NumberSixtyFourth) + if err == nil { + ids = append(ids, num) + } + } + + cli, err := svc.GetRpcClient(l.svcCtx.ChoreName) + if err != nil { + logx.Errorf("get order err: %v", err) + return areas, utils.ErrorInternalServer + } + + client := chore.NewChoreClient(cli.Conn()) + w := chore.RegionsByIdsReq{Ids: ids} + info, err := client.RegionsByIds(context.Background(), &w) + if err != nil { + logx.Errorf("get order err: %v", err) + return areas, utils.ErrorInternalServer + } + + for k, v := range info.Items { + switch k { + case utils.NumberZero: + areas.ProvinceId = v.Id + areas.ProvinceName = v.Name + case utils.NumberOne: + areas.CityId = v.Id + areas.CityName = v.Name + case utils.NumberTwo: + areas.CountyId = v.Id + areas.CountyName = v.Name + } + } + return areas, utils.Ok +} + +func (l *WebStoreAddLogic) createUser(info dao.StoreCreate, mobile, password string) utils.Status { + cli, err := svc.GetRpcClient(l.svcCtx.UserName) + if err != nil { + logx.Errorf("get user err: %v", err) + return utils.ErrorInternalServer + } + + client := user.NewUserClient(cli.Conn()) + + data := user.InternalCreateReq{ + BizId: info.Id, + Mobile: mobile, + Name: info.UserName, + ClientCode: []string{dao.StoreTypeBeauty}, //哪端 + CredentialType: []string{dao.LoginTypePassword, dao.LoginTypeSms}, + Identifier: mobile, //手机号 + Secret: password, //密码 + } + + _, err = client.InternalCreate(context.Background(), &data) + if err != nil { + logx.Errorf("get user err: %v", err) + return utils.ErrorInternalServer + } + + return utils.Ok +} + +func (l *WebStoreAddLogic) sendMessage() { + // biz_type: 1产品 2门店 3地址 4销售;type: 消息场景;action: 0未用 1通过 2拒绝 + wecomrpc.SendMessage(l.ctx, l.svcCtx.WeComName, wecomrpc.SendMessageJob{ + BizId: objID, // 门店ID + BizType: wecomrpc.BizTypeStore, + Type: wecomrpc.ProductSubmitReview, + }) +} diff --git a/services/store/internal/model/store.go b/services/store/internal/model/store.go index f8143c6..ea0c5b2 100644 --- a/services/store/internal/model/store.go +++ b/services/store/internal/model/store.go @@ -23,6 +23,6 @@ func (m StoreModel) Init() StoreModel { return m } -func (m StoreModel) Create(data *dao.DepositCreate) error { +func (m StoreModel) Create(data *dao.StoreCreate) error { return m.Base.Create(data) } diff --git a/services/store/internal/server/storeServer.go b/services/store/internal/server/storeServer.go index 9bb5b2e..b963351 100644 --- a/services/store/internal/server/storeServer.go +++ b/services/store/internal/server/storeServer.go @@ -143,6 +143,36 @@ func (s *StoreServer) WebDepositItems(ctx context.Context, in *store.WebDepositI return l.WebDepositItems(in) } +func (s *StoreServer) WebCheckPayPassword(ctx context.Context, in *store.EmptyRequest) (*store.Response, error) { + l := logic.NewWebCheckPayPasswordLogic(ctx, s.svcCtx) + return l.WebCheckPayPassword(in) +} + +func (s *StoreServer) WebSetPayPassword(ctx context.Context, in *store.WebSetPayPasswordRequest) (*store.Response, error) { + l := logic.NewWebSetPayPasswordLogic(ctx, s.svcCtx) + return l.WebSetPayPassword(in) +} + +func (s *StoreServer) WebPayMoney(ctx context.Context, in *store.EmptyRequest) (*store.Response, error) { + l := logic.NewWebPayMoneyLogic(ctx, s.svcCtx) + return l.WebPayMoney(in) +} + +func (s *StoreServer) WebInfo(ctx context.Context, in *store.EmptyRequest) (*store.Response, error) { + l := logic.NewWebInfoLogic(ctx, s.svcCtx) + return l.WebInfo(in) +} + +func (s *StoreServer) WebLowerStoreItems(ctx context.Context, in *store.WebLowerStoreItemsReq) (*store.Response, error) { + l := logic.NewWebLowerStoreItemsLogic(ctx, s.svcCtx) + return l.WebLowerStoreItems(in) +} + +func (s *StoreServer) WebStoreAdd(ctx context.Context, in *store.WebStoreAddReq) (*store.Response, error) { + l := logic.NewWebStoreAddLogic(ctx, s.svcCtx) + return l.WebStoreAdd(in) +} + func (s *StoreServer) SetDef(ctx context.Context, in *store.EmptyRequest) (*store.Response, error) { l := logic.NewSetDefLogic(ctx, s.svcCtx) return l.SetDef(in) diff --git a/services/store/internal/svc/servicecontext.go b/services/store/internal/svc/servicecontext.go index bd99f2b..71d5aef 100644 --- a/services/store/internal/svc/servicecontext.go +++ b/services/store/internal/svc/servicecontext.go @@ -80,6 +80,7 @@ type ServiceContext struct { UserName string ChoreName string MessageName string + WeComName string } func NewServiceContext(c config.Config, db *gorm.DB) *ServiceContext { @@ -107,14 +108,21 @@ func NewServiceContext(c config.Config, db *gorm.DB) *ServiceContext { if MessageSvc == utils.StringEmpty { logx.Error("config services.message empty") } + WeComSvc := utils.GetConfigString("services.wecom") + if WeComSvc == utils.StringEmpty { + logx.Error("config services.wecom empty") + } + svcCtx := &ServiceContext{ - Config: c, - DB: db, - Prefix: utils.GetConfigString("mysql.prefix"), - SaleName: SaleSvc, - OrderName: OrderSvc, - UserName: UserSvc, - ChoreName: ChoreSvc, + Config: c, + DB: db, + Prefix: utils.GetConfigString("mysql.prefix"), + SaleName: SaleSvc, + OrderName: OrderSvc, + UserName: UserSvc, + ChoreName: ChoreSvc, + MessageName: MessageSvc, + WeComName: WeComSvc, } return svcCtx diff --git a/services/store/storeclient/store.go b/services/store/storeclient/store.go index 8fd29a4..7cacfba 100644 --- a/services/store/storeclient/store.go +++ b/services/store/storeclient/store.go @@ -14,28 +14,31 @@ import ( ) type ( - ApplyEditRequest = store.ApplyEditRequest - ContentRequest = store.ContentRequest - CreateRequest = store.CreateRequest - DepositBackfillRequest = store.DepositBackfillRequest - DepositIgnoreRequest = store.DepositIgnoreRequest - DepositItemsRequest = store.DepositItemsRequest - DepositVerifyRequest = store.DepositVerifyRequest - EditRequest = store.EditRequest - EmptyRequest = store.EmptyRequest - ExcelExportResponse = store.ExcelExportResponse - IdRequest = store.IdRequest - IdsRequest = store.IdsRequest - InfoResponse = store.InfoResponse - ItemsRequest = store.ItemsRequest - ItemsResponse = store.ItemsResponse - Response = store.Response - StatusRequest = store.StatusRequest - ToSaleRequest = store.ToSaleRequest - VerifyEditRequest = store.VerifyEditRequest - VerifyItemsRequest = store.VerifyItemsRequest - WebDepositCreateRequest = store.WebDepositCreateRequest - WebDepositItemsRequest = store.WebDepositItemsRequest + ApplyEditRequest = store.ApplyEditRequest + ContentRequest = store.ContentRequest + CreateRequest = store.CreateRequest + DepositBackfillRequest = store.DepositBackfillRequest + DepositIgnoreRequest = store.DepositIgnoreRequest + DepositItemsRequest = store.DepositItemsRequest + DepositVerifyRequest = store.DepositVerifyRequest + EditRequest = store.EditRequest + EmptyRequest = store.EmptyRequest + ExcelExportResponse = store.ExcelExportResponse + IdRequest = store.IdRequest + IdsRequest = store.IdsRequest + InfoResponse = store.InfoResponse + ItemsRequest = store.ItemsRequest + ItemsResponse = store.ItemsResponse + Response = store.Response + StatusRequest = store.StatusRequest + ToSaleRequest = store.ToSaleRequest + VerifyEditRequest = store.VerifyEditRequest + VerifyItemsRequest = store.VerifyItemsRequest + WebDepositCreateRequest = store.WebDepositCreateRequest + WebDepositItemsRequest = store.WebDepositItemsRequest + WebLowerStoreItemsReq = store.WebLowerStoreItemsReq + WebSetPayPasswordRequest = store.WebSetPayPasswordRequest + WebStoreAddReq = store.WebStoreAddReq Store interface { Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) @@ -62,6 +65,12 @@ type ( DepositBackfill(ctx context.Context, in *DepositBackfillRequest, opts ...grpc.CallOption) (*Response, error) WebDepositCreate(ctx context.Context, in *WebDepositCreateRequest, opts ...grpc.CallOption) (*Response, error) WebDepositItems(ctx context.Context, in *WebDepositItemsRequest, opts ...grpc.CallOption) (*Response, error) + WebCheckPayPassword(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) + WebSetPayPassword(ctx context.Context, in *WebSetPayPasswordRequest, opts ...grpc.CallOption) (*Response, error) + WebPayMoney(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) + WebInfo(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) + WebLowerStoreItems(ctx context.Context, in *WebLowerStoreItemsReq, opts ...grpc.CallOption) (*Response, error) + WebStoreAdd(ctx context.Context, in *WebStoreAddReq, opts ...grpc.CallOption) (*Response, error) SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) GetInfoById(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*InfoResponse, error) GetInfoByIds(ctx context.Context, in *IdsRequest, opts ...grpc.CallOption) (*ItemsResponse, error) @@ -198,6 +207,36 @@ func (m *defaultStore) WebDepositItems(ctx context.Context, in *WebDepositItemsR return client.WebDepositItems(ctx, in, opts...) } +func (m *defaultStore) WebCheckPayPassword(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + client := store.NewStoreClient(m.cli.Conn()) + return client.WebCheckPayPassword(ctx, in, opts...) +} + +func (m *defaultStore) WebSetPayPassword(ctx context.Context, in *WebSetPayPasswordRequest, opts ...grpc.CallOption) (*Response, error) { + client := store.NewStoreClient(m.cli.Conn()) + return client.WebSetPayPassword(ctx, in, opts...) +} + +func (m *defaultStore) WebPayMoney(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + client := store.NewStoreClient(m.cli.Conn()) + return client.WebPayMoney(ctx, in, opts...) +} + +func (m *defaultStore) WebInfo(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { + client := store.NewStoreClient(m.cli.Conn()) + return client.WebInfo(ctx, in, opts...) +} + +func (m *defaultStore) WebLowerStoreItems(ctx context.Context, in *WebLowerStoreItemsReq, opts ...grpc.CallOption) (*Response, error) { + client := store.NewStoreClient(m.cli.Conn()) + return client.WebLowerStoreItems(ctx, in, opts...) +} + +func (m *defaultStore) WebStoreAdd(ctx context.Context, in *WebStoreAddReq, opts ...grpc.CallOption) (*Response, error) { + client := store.NewStoreClient(m.cli.Conn()) + return client.WebStoreAdd(ctx, in, opts...) +} + func (m *defaultStore) SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error) { client := store.NewStoreClient(m.cli.Conn()) return client.SetDef(ctx, in, opts...) diff --git a/services/store/validator/store.go b/services/store/validator/store.go index a33b8ea..c14b7bb 100644 --- a/services/store/validator/store.go +++ b/services/store/validator/store.go @@ -176,7 +176,7 @@ func (p StoreContentValidator) GetMessage() validate.ValidatorMessages { } } -type StoreWebCreateValidator struct { +type ApiStoreCreateValidator struct { UserMobile string `form:"user_mobile" json:"user_mobile" validate:"required"` Name string `form:"name" json:"name" validate:"required"` District string `form:"district" json:"district" validate:"required"` @@ -203,7 +203,7 @@ type StoreWebCreateValidator struct { } // GetMessage 提示消息 -func (p StoreWebCreateValidator) GetMessage() validate.ValidatorMessages { +func (p ApiStoreCreateValidator) GetMessage() validate.ValidatorMessages { return validate.ValidatorMessages{ "UserMobile.required": "手机号不能为空", "Name.required": "名称不能为空", @@ -222,6 +222,18 @@ func (p StoreWebCreateValidator) GetMessage() validate.ValidatorMessages { } } +type ApiStoreItemsValidator struct { + Name string `form:"name" json:"name"` + Page int64 `form:"page" json:"page"` + Size int64 `form:"size" json:"size"` + SaleId int64 `form:"sale_id" json:"sale_id"` +} + +// GetMessage 提示消息 +func (p ApiStoreItemsValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{} +} + type StoreVerifyItemsValidator struct { Name string `form:"name" json:"name"` Page int64 `form:"page" json:"page"` @@ -276,3 +288,14 @@ func (p ApplyEditValidator) GetMessage() validate.ValidatorMessages { "Reason.required": "理由不能为空", } } + +type WebSetPasswordValidator struct { + Password string `form:"password" json:"password" validate:"required"` +} + +// GetMessage 提示消息 +func (p WebSetPasswordValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Password.required": "请输入密码", + } +}