From 647abf73f6e424aad42cccc0f49c8d8adc73e8d4 Mon Sep 17 00:00:00 2001 From: gjs Date: Wed, 16 Sep 2026 16:39:14 +0800 Subject: [PATCH] order --- pkg/redis/redis.go | 1 + pkg/utils/status.go | 14 + rpc/store/pb/store.pb.go | 740 ++++++++++++++---- rpc/store/pb/store_grpc.pb.go | 86 +- rpc/store/store.pb | Bin 18681 -> 19840 bytes rpc/store/store.proto | 63 +- .../factory/internal/logic/groupItemsLogic.go | 2 +- services/order/internal/logic/base.go | 28 + services/order/internal/logic/itemsLogic.go | 2 + services/sale/run.toml | 59 -- ...sPersonHistory.go => saleChangeHistory.go} | 0 services/user/.gitignore | 3 +- 12 files changed, 789 insertions(+), 209 deletions(-) delete mode 100644 services/sale/run.toml rename services/store/internal/model/{salesPersonHistory.go => saleChangeHistory.go} (100%) diff --git a/pkg/redis/redis.go b/pkg/redis/redis.go index 461623c..087a676 100644 --- a/pkg/redis/redis.go +++ b/pkg/redis/redis.go @@ -9,6 +9,7 @@ import ( ) const Nil = goredis.Nil +const RedisNil = "redis: nil" var Client *goredis.Client diff --git a/pkg/utils/status.go b/pkg/utils/status.go index 4e28d6e..9e64dfd 100644 --- a/pkg/utils/status.go +++ b/pkg/utils/status.go @@ -73,6 +73,20 @@ const ( StatusWaitPass = 9 //待审核 RpcTimeOut = 5000 //服务连接超时时间 毫秒 + + StoreApplyReview = 1 // 提交审核（按钮消息） + StoreNeedReview = 2 // 通知申请人 + StoreSubmitReview = 3 // 通知一审人员 + StoreFirstReview = 4 // 一审审核结果 + StoreSecondReview = 5 // 二审审核结果 + + SaleType = 1 + AdminType = 2 + + EditLogTypeProduct = 1 // 产品 + EditLogTypeStore = 2 // 门店 + EditLogTypeAddress = 3 // 地址 + EditLogTypeSales = 4 // 销售 ) const ( diff --git a/rpc/store/pb/store.pb.go b/rpc/store/pb/store.pb.go index 70560da..757478c 100644 --- a/rpc/store/pb/store.pb.go +++ b/rpc/store/pb/store.pb.go @@ -102,6 +102,50 @@ func (x *IdRequest) GetId() int64 { return 0 } +type IdsRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id []int64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *IdsRequest) Reset() { + *x = IdsRequest{} + mi := &file_store_store_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *IdsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*IdsRequest) ProtoMessage() {} + +func (x *IdsRequest) ProtoReflect() protoreflect.Message { + mi := &file_store_store_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 IdsRequest.ProtoReflect.Descriptor instead. +func (*IdsRequest) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{2} +} + +func (x *IdsRequest) GetId() []int64 { + if x != nil { + return x.Id + } + return nil +} + type StatusRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` @@ -113,7 +157,7 @@ type StatusRequest struct { func (x *StatusRequest) Reset() { *x = StatusRequest{} - mi := &file_store_store_proto_msgTypes[2] + mi := &file_store_store_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -125,7 +169,7 @@ func (x *StatusRequest) String() string { func (*StatusRequest) ProtoMessage() {} func (x *StatusRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[2] + mi := &file_store_store_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -138,7 +182,7 @@ func (x *StatusRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use StatusRequest.ProtoReflect.Descriptor instead. func (*StatusRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{2} + return file_store_store_proto_rawDescGZIP(), []int{3} } func (x *StatusRequest) GetId() int64 { @@ -173,7 +217,7 @@ type Response struct { func (x *Response) Reset() { *x = Response{} - mi := &file_store_store_proto_msgTypes[3] + mi := &file_store_store_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -185,7 +229,7 @@ func (x *Response) String() string { func (*Response) ProtoMessage() {} func (x *Response) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[3] + mi := &file_store_store_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -198,7 +242,7 @@ func (x *Response) ProtoReflect() protoreflect.Message { // Deprecated: Use Response.ProtoReflect.Descriptor instead. func (*Response) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{3} + return file_store_store_proto_rawDescGZIP(), []int{4} } func (x *Response) GetCode() int32 { @@ -246,7 +290,7 @@ type EditRequest struct { LatitudeWgs84 string `protobuf:"bytes,20,opt,name=latitude_wgs84,json=latitudeWgs84,proto3" json:"latitude_wgs84,omitempty"` LongitudeGcj02 string `protobuf:"bytes,21,opt,name=longitude_gcj02,json=longitudeGcj02,proto3" json:"longitude_gcj02,omitempty"` LatitudeGcj02 string `protobuf:"bytes,22,opt,name=latitude_gcj02,json=latitudeGcj02,proto3" json:"latitude_gcj02,omitempty"` - StoreType int64 `protobuf:"varint,23,opt,name=store_type,json=storeType,proto3" json:"store_type,omitempty"` + StoreType []string `protobuf:"bytes,23,rep,name=store_type,json=storeType,proto3" json:"store_type,omitempty"` Province int64 `protobuf:"varint,24,opt,name=province,proto3" json:"province,omitempty"` ProvinceName string `protobuf:"bytes,25,opt,name=province_name,json=provinceName,proto3" json:"province_name,omitempty"` City int64 `protobuf:"varint,26,opt,name=city,proto3" json:"city,omitempty"` @@ -259,7 +303,7 @@ type EditRequest struct { func (x *EditRequest) Reset() { *x = EditRequest{} - mi := &file_store_store_proto_msgTypes[4] + mi := &file_store_store_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -271,7 +315,7 @@ func (x *EditRequest) String() string { func (*EditRequest) ProtoMessage() {} func (x *EditRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[4] + mi := &file_store_store_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -284,7 +328,7 @@ func (x *EditRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use EditRequest.ProtoReflect.Descriptor instead. func (*EditRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{4} + return file_store_store_proto_rawDescGZIP(), []int{5} } func (x *EditRequest) GetId() int64 { @@ -441,11 +485,11 @@ func (x *EditRequest) GetLatitudeGcj02() string { return "" } -func (x *EditRequest) GetStoreType() int64 { +func (x *EditRequest) GetStoreType() []string { if x != nil { return x.StoreType } - return 0 + return nil } func (x *EditRequest) GetProvince() int64 { @@ -517,7 +561,7 @@ type CreateRequest struct { LatitudeWgs84 string `protobuf:"bytes,23,opt,name=latitude_wgs84,json=latitudeWgs84,proto3" json:"latitude_wgs84,omitempty"` LongitudeGcj02 string `protobuf:"bytes,24,opt,name=longitude_gcj02,json=longitudeGcj02,proto3" json:"longitude_gcj02,omitempty"` LatitudeGcj02 string `protobuf:"bytes,25,opt,name=latitude_gcj02,json=latitudeGcj02,proto3" json:"latitude_gcj02,omitempty"` - StoreType int64 `protobuf:"varint,26,opt,name=store_type,json=storeType,proto3" json:"store_type,omitempty"` + StoreType []string `protobuf:"bytes,26,rep,name=store_type,json=storeType,proto3" json:"store_type,omitempty"` Province int64 `protobuf:"varint,27,opt,name=province,proto3" json:"province,omitempty"` ProvinceName string `protobuf:"bytes,28,opt,name=province_name,json=provinceName,proto3" json:"province_name,omitempty"` City int64 `protobuf:"varint,29,opt,name=city,proto3" json:"city,omitempty"` @@ -530,7 +574,7 @@ type CreateRequest struct { func (x *CreateRequest) Reset() { *x = CreateRequest{} - mi := &file_store_store_proto_msgTypes[5] + mi := &file_store_store_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -542,7 +586,7 @@ func (x *CreateRequest) String() string { func (*CreateRequest) ProtoMessage() {} func (x *CreateRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[5] + mi := &file_store_store_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -555,7 +599,7 @@ func (x *CreateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateRequest.ProtoReflect.Descriptor instead. func (*CreateRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{5} + return file_store_store_proto_rawDescGZIP(), []int{6} } func (x *CreateRequest) GetUserMobile() string { @@ -733,11 +777,11 @@ func (x *CreateRequest) GetLatitudeGcj02() string { return "" } -func (x *CreateRequest) GetStoreType() int64 { +func (x *CreateRequest) GetStoreType() []string { if x != nil { return x.StoreType } - return 0 + return nil } func (x *CreateRequest) GetProvince() int64 { @@ -782,6 +826,318 @@ func (x *CreateRequest) GetCountyName() string { return "" } +type InfoResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + UserMobile string `protobuf:"bytes,2,opt,name=user_mobile,json=userMobile,proto3" json:"user_mobile,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + IdCard string `protobuf:"bytes,4,opt,name=id_card,json=idCard,proto3" json:"id_card,omitempty"` + Receipt string `protobuf:"bytes,5,opt,name=receipt,proto3" json:"receipt,omitempty"` + Type int32 `protobuf:"varint,6,opt,name=type,proto3" json:"type,omitempty"` + Area string `protobuf:"bytes,7,opt,name=area,proto3" json:"area,omitempty"` + StoreImages string `protobuf:"bytes,8,opt,name=store_images,json=storeImages,proto3" json:"store_images,omitempty"` + DistrictIds string `protobuf:"bytes,9,opt,name=district_ids,json=districtIds,proto3" json:"district_ids,omitempty"` + Address string `protobuf:"bytes,10,opt,name=address,proto3" json:"address,omitempty"` + BankInfo string `protobuf:"bytes,11,opt,name=bank_info,json=bankInfo,proto3" json:"bank_info,omitempty"` + UserName string `protobuf:"bytes,12,opt,name=user_name,json=userName,proto3" json:"user_name,omitempty"` + BusinessLicense string `protobuf:"bytes,13,opt,name=business_license,json=businessLicense,proto3" json:"business_license,omitempty"` + Images string `protobuf:"bytes,14,opt,name=images,proto3" json:"images,omitempty"` + SaleId int64 `protobuf:"varint,15,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"` + Contact string `protobuf:"bytes,16,opt,name=contact,proto3" json:"contact,omitempty"` + Content string `protobuf:"bytes,17,opt,name=content,proto3" json:"content,omitempty"` + OpenTime string `protobuf:"bytes,18,opt,name=open_time,json=openTime,proto3" json:"open_time,omitempty"` + LongitudeWgs84 string `protobuf:"bytes,19,opt,name=longitude_wgs84,json=longitudeWgs84,proto3" json:"longitude_wgs84,omitempty"` + LatitudeWgs84 string `protobuf:"bytes,20,opt,name=latitude_wgs84,json=latitudeWgs84,proto3" json:"latitude_wgs84,omitempty"` + LongitudeGcj02 string `protobuf:"bytes,21,opt,name=longitude_gcj02,json=longitudeGcj02,proto3" json:"longitude_gcj02,omitempty"` + LatitudeGcj02 string `protobuf:"bytes,22,opt,name=latitude_gcj02,json=latitudeGcj02,proto3" json:"latitude_gcj02,omitempty"` + StoreType []string `protobuf:"bytes,23,rep,name=store_type,json=storeType,proto3" json:"store_type,omitempty"` + Province int64 `protobuf:"varint,24,opt,name=province,proto3" json:"province,omitempty"` + ProvinceName string `protobuf:"bytes,25,opt,name=province_name,json=provinceName,proto3" json:"province_name,omitempty"` + City int64 `protobuf:"varint,26,opt,name=city,proto3" json:"city,omitempty"` + CityName string `protobuf:"bytes,27,opt,name=city_name,json=cityName,proto3" json:"city_name,omitempty"` + County int64 `protobuf:"varint,28,opt,name=county,proto3" json:"county,omitempty"` + CountyName string `protobuf:"bytes,29,opt,name=county_name,json=countyName,proto3" json:"county_name,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *InfoResponse) Reset() { + *x = InfoResponse{} + mi := &file_store_store_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *InfoResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*InfoResponse) ProtoMessage() {} + +func (x *InfoResponse) ProtoReflect() protoreflect.Message { + mi := &file_store_store_proto_msgTypes[7] + 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 InfoResponse.ProtoReflect.Descriptor instead. +func (*InfoResponse) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{7} +} + +func (x *InfoResponse) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *InfoResponse) GetUserMobile() string { + if x != nil { + return x.UserMobile + } + return "" +} + +func (x *InfoResponse) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *InfoResponse) GetIdCard() string { + if x != nil { + return x.IdCard + } + return "" +} + +func (x *InfoResponse) GetReceipt() string { + if x != nil { + return x.Receipt + } + return "" +} + +func (x *InfoResponse) GetType() int32 { + if x != nil { + return x.Type + } + return 0 +} + +func (x *InfoResponse) GetArea() string { + if x != nil { + return x.Area + } + return "" +} + +func (x *InfoResponse) GetStoreImages() string { + if x != nil { + return x.StoreImages + } + return "" +} + +func (x *InfoResponse) GetDistrictIds() string { + if x != nil { + return x.DistrictIds + } + return "" +} + +func (x *InfoResponse) GetAddress() string { + if x != nil { + return x.Address + } + return "" +} + +func (x *InfoResponse) GetBankInfo() string { + if x != nil { + return x.BankInfo + } + return "" +} + +func (x *InfoResponse) GetUserName() string { + if x != nil { + return x.UserName + } + return "" +} + +func (x *InfoResponse) GetBusinessLicense() string { + if x != nil { + return x.BusinessLicense + } + return "" +} + +func (x *InfoResponse) GetImages() string { + if x != nil { + return x.Images + } + return "" +} + +func (x *InfoResponse) GetSaleId() int64 { + if x != nil { + return x.SaleId + } + return 0 +} + +func (x *InfoResponse) GetContact() string { + if x != nil { + return x.Contact + } + return "" +} + +func (x *InfoResponse) GetContent() string { + if x != nil { + return x.Content + } + return "" +} + +func (x *InfoResponse) GetOpenTime() string { + if x != nil { + return x.OpenTime + } + return "" +} + +func (x *InfoResponse) GetLongitudeWgs84() string { + if x != nil { + return x.LongitudeWgs84 + } + return "" +} + +func (x *InfoResponse) GetLatitudeWgs84() string { + if x != nil { + return x.LatitudeWgs84 + } + return "" +} + +func (x *InfoResponse) GetLongitudeGcj02() string { + if x != nil { + return x.LongitudeGcj02 + } + return "" +} + +func (x *InfoResponse) GetLatitudeGcj02() string { + if x != nil { + return x.LatitudeGcj02 + } + return "" +} + +func (x *InfoResponse) GetStoreType() []string { + if x != nil { + return x.StoreType + } + return nil +} + +func (x *InfoResponse) GetProvince() int64 { + if x != nil { + return x.Province + } + return 0 +} + +func (x *InfoResponse) GetProvinceName() string { + if x != nil { + return x.ProvinceName + } + return "" +} + +func (x *InfoResponse) GetCity() int64 { + if x != nil { + return x.City + } + return 0 +} + +func (x *InfoResponse) GetCityName() string { + if x != nil { + return x.CityName + } + return "" +} + +func (x *InfoResponse) GetCounty() int64 { + if x != nil { + return x.County + } + return 0 +} + +func (x *InfoResponse) GetCountyName() string { + if x != nil { + return x.CountyName + } + return "" +} + +type ItemsResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Items []*InfoResponse `protobuf:"bytes,1,rep,name=items,proto3" json:"items,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ItemsResponse) Reset() { + *x = ItemsResponse{} + mi := &file_store_store_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ItemsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ItemsResponse) ProtoMessage() {} + +func (x *ItemsResponse) ProtoReflect() protoreflect.Message { + mi := &file_store_store_proto_msgTypes[8] + 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 ItemsResponse.ProtoReflect.Descriptor instead. +func (*ItemsResponse) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{8} +} + +func (x *ItemsResponse) GetItems() []*InfoResponse { + if x != nil { + return x.Items + } + return nil +} + type ToSaleRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` @@ -792,7 +1148,7 @@ type ToSaleRequest struct { func (x *ToSaleRequest) Reset() { *x = ToSaleRequest{} - mi := &file_store_store_proto_msgTypes[6] + mi := &file_store_store_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -804,7 +1160,7 @@ func (x *ToSaleRequest) String() string { func (*ToSaleRequest) ProtoMessage() {} func (x *ToSaleRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[6] + mi := &file_store_store_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -817,7 +1173,7 @@ func (x *ToSaleRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ToSaleRequest.ProtoReflect.Descriptor instead. func (*ToSaleRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{6} + return file_store_store_proto_rawDescGZIP(), []int{9} } func (x *ToSaleRequest) GetId() int64 { @@ -844,7 +1200,7 @@ type ContentRequest struct { func (x *ContentRequest) Reset() { *x = ContentRequest{} - mi := &file_store_store_proto_msgTypes[7] + mi := &file_store_store_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -856,7 +1212,7 @@ func (x *ContentRequest) String() string { func (*ContentRequest) ProtoMessage() {} func (x *ContentRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[7] + mi := &file_store_store_proto_msgTypes[10] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -869,7 +1225,7 @@ func (x *ContentRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ContentRequest.ProtoReflect.Descriptor instead. func (*ContentRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{7} + return file_store_store_proto_rawDescGZIP(), []int{10} } func (x *ContentRequest) GetId() int64 { @@ -899,7 +1255,7 @@ type ItemsRequest struct { func (x *ItemsRequest) Reset() { *x = ItemsRequest{} - mi := &file_store_store_proto_msgTypes[8] + mi := &file_store_store_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -911,7 +1267,7 @@ func (x *ItemsRequest) String() string { func (*ItemsRequest) ProtoMessage() {} func (x *ItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[8] + mi := &file_store_store_proto_msgTypes[11] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -924,7 +1280,7 @@ func (x *ItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ItemsRequest.ProtoReflect.Descriptor instead. func (*ItemsRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{8} + return file_store_store_proto_rawDescGZIP(), []int{11} } func (x *ItemsRequest) GetName() string { @@ -975,7 +1331,7 @@ type VerifyItemsRequest struct { func (x *VerifyItemsRequest) Reset() { *x = VerifyItemsRequest{} - mi := &file_store_store_proto_msgTypes[9] + mi := &file_store_store_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -987,7 +1343,7 @@ func (x *VerifyItemsRequest) String() string { func (*VerifyItemsRequest) ProtoMessage() {} func (x *VerifyItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[9] + mi := &file_store_store_proto_msgTypes[12] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1000,7 +1356,7 @@ func (x *VerifyItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use VerifyItemsRequest.ProtoReflect.Descriptor instead. func (*VerifyItemsRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{9} + return file_store_store_proto_rawDescGZIP(), []int{12} } func (x *VerifyItemsRequest) GetName() string { @@ -1047,7 +1403,7 @@ type VerifyEditRequest struct { func (x *VerifyEditRequest) Reset() { *x = VerifyEditRequest{} - mi := &file_store_store_proto_msgTypes[10] + mi := &file_store_store_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1059,7 +1415,7 @@ func (x *VerifyEditRequest) String() string { func (*VerifyEditRequest) ProtoMessage() {} func (x *VerifyEditRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[10] + mi := &file_store_store_proto_msgTypes[13] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1072,7 +1428,7 @@ func (x *VerifyEditRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use VerifyEditRequest.ProtoReflect.Descriptor instead. func (*VerifyEditRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{10} + return file_store_store_proto_rawDescGZIP(), []int{13} } func (x *VerifyEditRequest) GetId() int64 { @@ -1092,7 +1448,7 @@ type ApplyEditRequest struct { func (x *ApplyEditRequest) Reset() { *x = ApplyEditRequest{} - mi := &file_store_store_proto_msgTypes[11] + mi := &file_store_store_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1104,7 +1460,7 @@ func (x *ApplyEditRequest) String() string { func (*ApplyEditRequest) ProtoMessage() {} func (x *ApplyEditRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[11] + mi := &file_store_store_proto_msgTypes[14] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1117,7 +1473,7 @@ func (x *ApplyEditRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ApplyEditRequest.ProtoReflect.Descriptor instead. func (*ApplyEditRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{11} + return file_store_store_proto_rawDescGZIP(), []int{14} } func (x *ApplyEditRequest) GetId() int64 { @@ -1146,7 +1502,7 @@ type DepositItemsRequest struct { func (x *DepositItemsRequest) Reset() { *x = DepositItemsRequest{} - mi := &file_store_store_proto_msgTypes[12] + mi := &file_store_store_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1158,7 +1514,7 @@ func (x *DepositItemsRequest) String() string { func (*DepositItemsRequest) ProtoMessage() {} func (x *DepositItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[12] + mi := &file_store_store_proto_msgTypes[15] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1171,7 +1527,7 @@ func (x *DepositItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DepositItemsRequest.ProtoReflect.Descriptor instead. func (*DepositItemsRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{12} + return file_store_store_proto_rawDescGZIP(), []int{15} } func (x *DepositItemsRequest) GetName() string { @@ -1213,7 +1569,7 @@ type DepositVerifyRequest struct { func (x *DepositVerifyRequest) Reset() { *x = DepositVerifyRequest{} - mi := &file_store_store_proto_msgTypes[13] + mi := &file_store_store_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1225,7 +1581,7 @@ func (x *DepositVerifyRequest) String() string { func (*DepositVerifyRequest) ProtoMessage() {} func (x *DepositVerifyRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[13] + mi := &file_store_store_proto_msgTypes[16] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1238,7 +1594,7 @@ func (x *DepositVerifyRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DepositVerifyRequest.ProtoReflect.Descriptor instead. func (*DepositVerifyRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{13} + return file_store_store_proto_rawDescGZIP(), []int{16} } func (x *DepositVerifyRequest) GetName() string { @@ -1272,7 +1628,7 @@ type DepositIgnoreRequest struct { func (x *DepositIgnoreRequest) Reset() { *x = DepositIgnoreRequest{} - mi := &file_store_store_proto_msgTypes[14] + mi := &file_store_store_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1284,7 +1640,7 @@ func (x *DepositIgnoreRequest) String() string { func (*DepositIgnoreRequest) ProtoMessage() {} func (x *DepositIgnoreRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[14] + mi := &file_store_store_proto_msgTypes[17] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1297,7 +1653,7 @@ func (x *DepositIgnoreRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DepositIgnoreRequest.ProtoReflect.Descriptor instead. func (*DepositIgnoreRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{14} + return file_store_store_proto_rawDescGZIP(), []int{17} } func (x *DepositIgnoreRequest) GetId() int64 { @@ -1324,7 +1680,7 @@ type DepositBackfillRequest struct { func (x *DepositBackfillRequest) Reset() { *x = DepositBackfillRequest{} - mi := &file_store_store_proto_msgTypes[15] + mi := &file_store_store_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1336,7 +1692,7 @@ func (x *DepositBackfillRequest) String() string { func (*DepositBackfillRequest) ProtoMessage() {} func (x *DepositBackfillRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[15] + mi := &file_store_store_proto_msgTypes[18] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1349,7 +1705,7 @@ func (x *DepositBackfillRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DepositBackfillRequest.ProtoReflect.Descriptor instead. func (*DepositBackfillRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{15} + return file_store_store_proto_rawDescGZIP(), []int{18} } func (x *DepositBackfillRequest) GetId() int64 { @@ -1376,7 +1732,7 @@ type WebDepositCreateRequest struct { func (x *WebDepositCreateRequest) Reset() { *x = WebDepositCreateRequest{} - mi := &file_store_store_proto_msgTypes[16] + mi := &file_store_store_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1388,7 +1744,7 @@ func (x *WebDepositCreateRequest) String() string { func (*WebDepositCreateRequest) ProtoMessage() {} func (x *WebDepositCreateRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[16] + mi := &file_store_store_proto_msgTypes[19] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1401,7 +1757,7 @@ func (x *WebDepositCreateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use WebDepositCreateRequest.ProtoReflect.Descriptor instead. func (*WebDepositCreateRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{16} + return file_store_store_proto_rawDescGZIP(), []int{19} } func (x *WebDepositCreateRequest) GetBill() string { @@ -1428,7 +1784,7 @@ type WebDepositItemsRequest struct { func (x *WebDepositItemsRequest) Reset() { *x = WebDepositItemsRequest{} - mi := &file_store_store_proto_msgTypes[17] + mi := &file_store_store_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1440,7 +1796,7 @@ func (x *WebDepositItemsRequest) String() string { func (*WebDepositItemsRequest) ProtoMessage() {} func (x *WebDepositItemsRequest) ProtoReflect() protoreflect.Message { - mi := &file_store_store_proto_msgTypes[17] + mi := &file_store_store_proto_msgTypes[20] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1453,7 +1809,7 @@ func (x *WebDepositItemsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use WebDepositItemsRequest.ProtoReflect.Descriptor instead. func (*WebDepositItemsRequest) Descriptor() ([]byte, []int) { - return file_store_store_proto_rawDescGZIP(), []int{17} + return file_store_store_proto_rawDescGZIP(), []int{20} } func (x *WebDepositItemsRequest) GetPage() int32 { @@ -1470,6 +1826,66 @@ func (x *WebDepositItemsRequest) GetSize() int32 { return 0 } +type ExcelExportResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` // excel二进制 + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Msg string `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ExcelExportResponse) Reset() { + *x = ExcelExportResponse{} + mi := &file_store_store_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ExcelExportResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ExcelExportResponse) ProtoMessage() {} + +func (x *ExcelExportResponse) ProtoReflect() protoreflect.Message { + mi := &file_store_store_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 ExcelExportResponse.ProtoReflect.Descriptor instead. +func (*ExcelExportResponse) Descriptor() ([]byte, []int) { + return file_store_store_proto_rawDescGZIP(), []int{21} +} + +func (x *ExcelExportResponse) GetData() []byte { + if x != nil { + return x.Data + } + return nil +} + +func (x *ExcelExportResponse) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *ExcelExportResponse) GetMsg() string { + if x != nil { + return x.Msg + } + return "" +} + var File_store_store_proto protoreflect.FileDescriptor const file_store_store_proto_rawDesc = "" + @@ -1477,7 +1893,10 @@ const file_store_store_proto_rawDesc = "" + "\x11store/store.proto\x12\x05store\x1a\x1cgoogle/api/annotations.proto\"\x0e\n" + "\fEmptyRequest\"\x1b\n" + "\tIdRequest\x12\x0e\n" + - "\x02id\x18\x01 \x01(\x03R\x02id\"O\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"\x1c\n" + + "\n" + + "IdsRequest\x12\x0e\n" + + "\x02id\x18\x01 \x03(\x03R\x02id\"O\n" + "\rStatusRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" + "\x06status\x18\x02 \x01(\x05R\x06status\x12\x16\n" + @@ -1512,7 +1931,7 @@ const file_store_store_proto_rawDesc = "" + "\x0flongitude_gcj02\x18\x15 \x01(\tR\x0elongitudeGcj02\x12%\n" + "\x0elatitude_gcj02\x18\x16 \x01(\tR\rlatitudeGcj02\x12\x1d\n" + "\n" + - "store_type\x18\x17 \x01(\x03R\tstoreType\x12\x1a\n" + + "store_type\x18\x17 \x03(\tR\tstoreType\x12\x1a\n" + "\bprovince\x18\x18 \x01(\x03R\bprovince\x12#\n" + "\rprovince_name\x18\x19 \x01(\tR\fprovinceName\x12\x12\n" + "\x04city\x18\x1a \x01(\x03R\x04city\x12\x1b\n" + @@ -1549,14 +1968,50 @@ const file_store_store_proto_rawDesc = "" + "\x0flongitude_gcj02\x18\x18 \x01(\tR\x0elongitudeGcj02\x12%\n" + "\x0elatitude_gcj02\x18\x19 \x01(\tR\rlatitudeGcj02\x12\x1d\n" + "\n" + - "store_type\x18\x1a \x01(\x03R\tstoreType\x12\x1a\n" + + "store_type\x18\x1a \x03(\tR\tstoreType\x12\x1a\n" + "\bprovince\x18\x1b \x01(\x03R\bprovince\x12#\n" + "\rprovince_name\x18\x1c \x01(\tR\fprovinceName\x12\x12\n" + "\x04city\x18\x1d \x01(\x03R\x04city\x12\x1b\n" + "\tcity_name\x18\x1e \x01(\tR\bcityName\x12\x16\n" + "\x06county\x18\x1f \x01(\x03R\x06county\x12\x1f\n" + "\vcounty_name\x18 \x01(\tR\n" + - "countyName\"8\n" + + "countyName\"\xdf\x06\n" + + "\fInfoResponse\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1f\n" + + "\vuser_mobile\x18\x02 \x01(\tR\n" + + "userMobile\x12\x12\n" + + "\x04name\x18\x03 \x01(\tR\x04name\x12\x17\n" + + "\aid_card\x18\x04 \x01(\tR\x06idCard\x12\x18\n" + + "\areceipt\x18\x05 \x01(\tR\areceipt\x12\x12\n" + + "\x04type\x18\x06 \x01(\x05R\x04type\x12\x12\n" + + "\x04area\x18\a \x01(\tR\x04area\x12!\n" + + "\fstore_images\x18\b \x01(\tR\vstoreImages\x12!\n" + + "\fdistrict_ids\x18\t \x01(\tR\vdistrictIds\x12\x18\n" + + "\aaddress\x18\n" + + " \x01(\tR\aaddress\x12\x1b\n" + + "\tbank_info\x18\v \x01(\tR\bbankInfo\x12\x1b\n" + + "\tuser_name\x18\f \x01(\tR\buserName\x12)\n" + + "\x10business_license\x18\r \x01(\tR\x0fbusinessLicense\x12\x16\n" + + "\x06images\x18\x0e \x01(\tR\x06images\x12\x17\n" + + "\asale_id\x18\x0f \x01(\x03R\x06saleId\x12\x18\n" + + "\acontact\x18\x10 \x01(\tR\acontact\x12\x18\n" + + "\acontent\x18\x11 \x01(\tR\acontent\x12\x1b\n" + + "\topen_time\x18\x12 \x01(\tR\bopenTime\x12'\n" + + "\x0flongitude_wgs84\x18\x13 \x01(\tR\x0elongitudeWgs84\x12%\n" + + "\x0elatitude_wgs84\x18\x14 \x01(\tR\rlatitudeWgs84\x12'\n" + + "\x0flongitude_gcj02\x18\x15 \x01(\tR\x0elongitudeGcj02\x12%\n" + + "\x0elatitude_gcj02\x18\x16 \x01(\tR\rlatitudeGcj02\x12\x1d\n" + + "\n" + + "store_type\x18\x17 \x03(\tR\tstoreType\x12\x1a\n" + + "\bprovince\x18\x18 \x01(\x03R\bprovince\x12#\n" + + "\rprovince_name\x18\x19 \x01(\tR\fprovinceName\x12\x12\n" + + "\x04city\x18\x1a \x01(\x03R\x04city\x12\x1b\n" + + "\tcity_name\x18\x1b \x01(\tR\bcityName\x12\x16\n" + + "\x06county\x18\x1c \x01(\x03R\x06county\x12\x1f\n" + + "\vcounty_name\x18\x1d \x01(\tR\n" + + "countyName\":\n" + + "\rItemsResponse\x12)\n" + + "\x05items\x18\x01 \x03(\v2\x13.store.InfoResponseR\x05items\"8\n" + "\rToSaleRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x17\n" + "\asale_id\x18\x02 \x01(\x03R\x06saleId\":\n" + @@ -1600,7 +2055,11 @@ const file_store_store_proto_rawDesc = "" + "\x06amount\x18\x02 \x01(\x01R\x06amount\"@\n" + "\x16WebDepositItemsRequest\x12\x12\n" + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + - "\x04size\x18\x02 \x01(\x05R\x04size2\xa2\x12\n" + + "\x04size\x18\x02 \x01(\x05R\x04size\"O\n" + + "\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" + "\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" + @@ -1619,15 +2078,17 @@ const file_store_store_proto_rawDesc = "" + "\x11ApplyVerifyStatus\x12\x14.store.StatusRequest\x1a\x0f.store.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/admin/v3/store/apply/status\x12Y\n" + "\vDepositDone\x12\x10.store.IdRequest\x1a\x0f.store.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/admin/v3/store/deposit/done\x12h\n" + "\rDepositIgnore\x12\x1b.store.DepositIgnoreRequest\x1a\x0f.store.Response\")\x82\xd3\xe4\x93\x02#:\x01*\"\x1e/admin/v3/store/deposit/ignore\x12h\n" + - "\rDepositVerify\x12\x1b.store.DepositVerifyRequest\x1a\x0f.store.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/admin/v3/store/deposit/verify\x12c\n" + - "\vDepositDown\x12\x1a.store.DepositItemsRequest\x1a\x0f.store.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\x12\x1c/admin/v3/store/deposit/down\x12e\n" + + "\rDepositVerify\x12\x1b.store.DepositVerifyRequest\x1a\x0f.store.Response\")\x82\xd3\xe4\x93\x02#:\x01*\x12\x1e/admin/v3/store/deposit/verify\x12n\n" + + "\vDepositDown\x12\x1a.store.DepositItemsRequest\x1a\x1a.store.ExcelExportResponse\"'\x82\xd3\xe4\x93\x02!:\x01*\x12\x1c/admin/v3/store/deposit/down\x12e\n" + "\fDepositItems\x12\x1a.store.DepositItemsRequest\x1a\x0f.store.Response\"(\x82\xd3\xe4\x93\x02\":\x01*\x12\x1d/admin/v3/store/deposit/items\x12s\n" + "\x12DepositIgnoreItems\x12\x1b.store.DepositVerifyRequest\x1a\x0f.store.Response\"/\x82\xd3\xe4\x93\x02):\x01*\x12$/admin/v3/store/deposit/ignore/items\x12_\n" + "\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" + - "\x06SetDef\x12\x13.store.EmptyRequest\x1a\x0f.store.ResponseB\tZ\a./storeb\x06proto3" + "\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" var ( file_store_store_proto_rawDescOnce sync.Once @@ -1641,83 +2102,92 @@ func file_store_store_proto_rawDescGZIP() []byte { return file_store_store_proto_rawDescData } -var file_store_store_proto_msgTypes = make([]protoimpl.MessageInfo, 18) +var file_store_store_proto_msgTypes = make([]protoimpl.MessageInfo, 22) var file_store_store_proto_goTypes = []any{ (*EmptyRequest)(nil), // 0: store.EmptyRequest (*IdRequest)(nil), // 1: store.IdRequest - (*StatusRequest)(nil), // 2: store.StatusRequest - (*Response)(nil), // 3: store.Response - (*EditRequest)(nil), // 4: store.EditRequest - (*CreateRequest)(nil), // 5: store.CreateRequest - (*ToSaleRequest)(nil), // 6: store.ToSaleRequest - (*ContentRequest)(nil), // 7: store.ContentRequest - (*ItemsRequest)(nil), // 8: store.ItemsRequest - (*VerifyItemsRequest)(nil), // 9: store.VerifyItemsRequest - (*VerifyEditRequest)(nil), // 10: store.VerifyEditRequest - (*ApplyEditRequest)(nil), // 11: store.ApplyEditRequest - (*DepositItemsRequest)(nil), // 12: store.DepositItemsRequest - (*DepositVerifyRequest)(nil), // 13: store.DepositVerifyRequest - (*DepositIgnoreRequest)(nil), // 14: store.DepositIgnoreRequest - (*DepositBackfillRequest)(nil), // 15: store.DepositBackfillRequest - (*WebDepositCreateRequest)(nil), // 16: store.WebDepositCreateRequest - (*WebDepositItemsRequest)(nil), // 17: store.WebDepositItemsRequest + (*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 } var file_store_store_proto_depIdxs = []int32{ - 2, // 0: store.Store.Status:input_type -> store.StatusRequest - 4, // 1: store.Store.Edit:input_type -> store.EditRequest - 5, // 2: store.Store.Create:input_type -> store.CreateRequest - 6, // 3: store.Store.ToSale:input_type -> store.ToSaleRequest - 1, // 4: store.Store.Info:input_type -> store.IdRequest - 7, // 5: store.Store.Content:input_type -> store.ContentRequest - 0, // 6: store.Store.Names:input_type -> store.EmptyRequest - 8, // 7: store.Store.Items:input_type -> store.ItemsRequest - 9, // 8: store.Store.VerifyItems:input_type -> store.VerifyItemsRequest - 2, // 9: store.Store.VerifyStatus:input_type -> store.StatusRequest - 4, // 10: store.Store.VerifyEdit:input_type -> store.EditRequest - 11, // 11: store.Store.ApplyEdit:input_type -> store.ApplyEditRequest - 8, // 12: store.Store.ApplyVerify:input_type -> store.ItemsRequest - 2, // 13: store.Store.ApplyVerifyStatus:input_type -> store.StatusRequest - 1, // 14: store.Store.DepositDone:input_type -> store.IdRequest - 14, // 15: store.Store.DepositIgnore:input_type -> store.DepositIgnoreRequest - 13, // 16: store.Store.DepositVerify:input_type -> store.DepositVerifyRequest - 12, // 17: store.Store.DepositDown:input_type -> store.DepositItemsRequest - 12, // 18: store.Store.DepositItems:input_type -> store.DepositItemsRequest - 13, // 19: store.Store.DepositIgnoreItems:input_type -> store.DepositVerifyRequest - 1, // 20: store.Store.DepositRecover:input_type -> store.IdRequest - 15, // 21: store.Store.DepositBackfill:input_type -> store.DepositBackfillRequest - 16, // 22: store.Store.WebDepositCreate:input_type -> store.WebDepositCreateRequest - 17, // 23: store.Store.WebDepositItems:input_type -> store.WebDepositItemsRequest - 0, // 24: store.Store.SetDef:input_type -> store.EmptyRequest - 3, // 25: store.Store.Status:output_type -> store.Response - 3, // 26: store.Store.Edit:output_type -> store.Response - 3, // 27: store.Store.Create:output_type -> store.Response - 3, // 28: store.Store.ToSale:output_type -> store.Response - 3, // 29: store.Store.Info:output_type -> store.Response - 3, // 30: store.Store.Content:output_type -> store.Response - 3, // 31: store.Store.Names:output_type -> store.Response - 3, // 32: store.Store.Items:output_type -> store.Response - 3, // 33: store.Store.VerifyItems:output_type -> store.Response - 3, // 34: store.Store.VerifyStatus:output_type -> store.Response - 3, // 35: store.Store.VerifyEdit:output_type -> store.Response - 3, // 36: store.Store.ApplyEdit:output_type -> store.Response - 3, // 37: store.Store.ApplyVerify:output_type -> store.Response - 3, // 38: store.Store.ApplyVerifyStatus:output_type -> store.Response - 3, // 39: store.Store.DepositDone:output_type -> store.Response - 3, // 40: store.Store.DepositIgnore:output_type -> store.Response - 3, // 41: store.Store.DepositVerify:output_type -> store.Response - 3, // 42: store.Store.DepositDown:output_type -> store.Response - 3, // 43: store.Store.DepositItems:output_type -> store.Response - 3, // 44: store.Store.DepositIgnoreItems:output_type -> store.Response - 3, // 45: store.Store.DepositRecover:output_type -> store.Response - 3, // 46: store.Store.DepositBackfill:output_type -> store.Response - 3, // 47: store.Store.WebDepositCreate:output_type -> store.Response - 3, // 48: store.Store.WebDepositItems:output_type -> store.Response - 3, // 49: store.Store.SetDef:output_type -> store.Response - 25, // [25:50] is the sub-list for method output_type - 0, // [0:25] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 7, // 0: store.ItemsResponse.items:type_name -> store.InfoResponse + 3, // 1: store.Store.Status:input_type -> store.StatusRequest + 5, // 2: store.Store.Edit:input_type -> store.EditRequest + 6, // 3: store.Store.Create:input_type -> store.CreateRequest + 9, // 4: store.Store.ToSale:input_type -> store.ToSaleRequest + 1, // 5: store.Store.Info:input_type -> store.IdRequest + 10, // 6: store.Store.Content:input_type -> store.ContentRequest + 0, // 7: store.Store.Names:input_type -> store.EmptyRequest + 11, // 8: store.Store.Items:input_type -> store.ItemsRequest + 12, // 9: store.Store.VerifyItems:input_type -> store.VerifyItemsRequest + 3, // 10: store.Store.VerifyStatus:input_type -> store.StatusRequest + 5, // 11: store.Store.VerifyEdit:input_type -> store.EditRequest + 14, // 12: store.Store.ApplyEdit:input_type -> store.ApplyEditRequest + 11, // 13: store.Store.ApplyVerify:input_type -> store.ItemsRequest + 3, // 14: store.Store.ApplyVerifyStatus:input_type -> store.StatusRequest + 1, // 15: store.Store.DepositDone:input_type -> store.IdRequest + 17, // 16: store.Store.DepositIgnore:input_type -> store.DepositIgnoreRequest + 16, // 17: store.Store.DepositVerify:input_type -> store.DepositVerifyRequest + 15, // 18: store.Store.DepositDown:input_type -> store.DepositItemsRequest + 15, // 19: store.Store.DepositItems:input_type -> store.DepositItemsRequest + 16, // 20: store.Store.DepositIgnoreItems:input_type -> store.DepositVerifyRequest + 1, // 21: store.Store.DepositRecover:input_type -> store.IdRequest + 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 + 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 } func init() { file_store_store_proto_init() } @@ -1731,7 +2201,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: 18, + NumMessages: 22, NumExtensions: 0, NumServices: 1, }, diff --git a/rpc/store/pb/store_grpc.pb.go b/rpc/store/pb/store_grpc.pb.go index d021e5f..f258d0e 100644 --- a/rpc/store/pb/store_grpc.pb.go +++ b/rpc/store/pb/store_grpc.pb.go @@ -44,6 +44,8 @@ const ( 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" ) // StoreClient is the client API for Store service. @@ -67,7 +69,7 @@ type StoreClient interface { DepositDone(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) DepositIgnore(ctx context.Context, in *DepositIgnoreRequest, opts ...grpc.CallOption) (*Response, error) DepositVerify(ctx context.Context, in *DepositVerifyRequest, opts ...grpc.CallOption) (*Response, error) - DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*Response, error) + DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) DepositItems(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*Response, error) DepositIgnoreItems(ctx context.Context, in *DepositVerifyRequest, opts ...grpc.CallOption) (*Response, error) DepositRecover(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*Response, error) @@ -75,6 +77,8 @@ type StoreClient interface { WebDepositCreate(ctx context.Context, in *WebDepositCreateRequest, opts ...grpc.CallOption) (*Response, error) WebDepositItems(ctx context.Context, in *WebDepositItemsRequest, 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) } type storeClient struct { @@ -255,9 +259,9 @@ func (c *storeClient) DepositVerify(ctx context.Context, in *DepositVerifyReques return out, nil } -func (c *storeClient) DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*Response, error) { +func (c *storeClient) DepositDown(ctx context.Context, in *DepositItemsRequest, opts ...grpc.CallOption) (*ExcelExportResponse, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) + out := new(ExcelExportResponse) err := c.cc.Invoke(ctx, Store_DepositDown_FullMethodName, in, out, cOpts...) if err != nil { return nil, err @@ -335,6 +339,26 @@ func (c *storeClient) SetDef(ctx context.Context, in *EmptyRequest, opts ...grpc return out, nil } +func (c *storeClient) GetInfoById(ctx context.Context, in *IdRequest, opts ...grpc.CallOption) (*InfoResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(InfoResponse) + err := c.cc.Invoke(ctx, Store_GetInfoById_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *storeClient) GetInfoByIds(ctx context.Context, in *IdsRequest, opts ...grpc.CallOption) (*ItemsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ItemsResponse) + err := c.cc.Invoke(ctx, Store_GetInfoByIds_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // StoreServer is the server API for Store service. // All implementations must embed UnimplementedStoreServer // for forward compatibility. @@ -356,7 +380,7 @@ type StoreServer interface { DepositDone(context.Context, *IdRequest) (*Response, error) DepositIgnore(context.Context, *DepositIgnoreRequest) (*Response, error) DepositVerify(context.Context, *DepositVerifyRequest) (*Response, error) - DepositDown(context.Context, *DepositItemsRequest) (*Response, error) + DepositDown(context.Context, *DepositItemsRequest) (*ExcelExportResponse, error) DepositItems(context.Context, *DepositItemsRequest) (*Response, error) DepositIgnoreItems(context.Context, *DepositVerifyRequest) (*Response, error) DepositRecover(context.Context, *IdRequest) (*Response, error) @@ -364,6 +388,8 @@ type StoreServer interface { WebDepositCreate(context.Context, *WebDepositCreateRequest) (*Response, error) WebDepositItems(context.Context, *WebDepositItemsRequest) (*Response, error) SetDef(context.Context, *EmptyRequest) (*Response, error) + GetInfoById(context.Context, *IdRequest) (*InfoResponse, error) + GetInfoByIds(context.Context, *IdsRequest) (*ItemsResponse, error) mustEmbedUnimplementedStoreServer() } @@ -425,7 +451,7 @@ func (UnimplementedStoreServer) DepositIgnore(context.Context, *DepositIgnoreReq func (UnimplementedStoreServer) DepositVerify(context.Context, *DepositVerifyRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method DepositVerify not implemented") } -func (UnimplementedStoreServer) DepositDown(context.Context, *DepositItemsRequest) (*Response, error) { +func (UnimplementedStoreServer) DepositDown(context.Context, *DepositItemsRequest) (*ExcelExportResponse, error) { return nil, status.Error(codes.Unimplemented, "method DepositDown not implemented") } func (UnimplementedStoreServer) DepositItems(context.Context, *DepositItemsRequest) (*Response, error) { @@ -449,6 +475,12 @@ func (UnimplementedStoreServer) WebDepositItems(context.Context, *WebDepositItem func (UnimplementedStoreServer) SetDef(context.Context, *EmptyRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method SetDef not implemented") } +func (UnimplementedStoreServer) GetInfoById(context.Context, *IdRequest) (*InfoResponse, error) { + return nil, status.Error(codes.Unimplemented, "method GetInfoById not implemented") +} +func (UnimplementedStoreServer) GetInfoByIds(context.Context, *IdsRequest) (*ItemsResponse, error) { + return nil, status.Error(codes.Unimplemented, "method GetInfoByIds not implemented") +} func (UnimplementedStoreServer) mustEmbedUnimplementedStoreServer() {} func (UnimplementedStoreServer) testEmbeddedByValue() {} @@ -920,6 +952,42 @@ func _Store_SetDef_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } +func _Store_GetInfoById_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).GetInfoById(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_GetInfoById_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).GetInfoById(ctx, req.(*IdRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Store_GetInfoByIds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(IdsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(StoreServer).GetInfoByIds(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Store_GetInfoByIds_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(StoreServer).GetInfoByIds(ctx, req.(*IdsRequest)) + } + return interceptor(ctx, in, info, handler) +} + // Store_ServiceDesc is the grpc.ServiceDesc for Store service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -1027,6 +1095,14 @@ var Store_ServiceDesc = grpc.ServiceDesc{ MethodName: "SetDef", Handler: _Store_SetDef_Handler, }, + { + MethodName: "GetInfoById", + Handler: _Store_GetInfoById_Handler, + }, + { + MethodName: "GetInfoByIds", + Handler: _Store_GetInfoByIds_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "store/store.proto", diff --git a/rpc/store/store.pb b/rpc/store/store.pb index 6c908adb1d0614e2e26b10be59a8c6362ecd15fd..c122583c3a2269392eefaaaf956434f013f7fe28 100644 GIT binary patch delta 390 zcmex4k+ESm|)}|%*?F8 zxw*&u7ML-)$6R7^qxF1&`)pi1o_T5cL8-+B`FX{un?IV&U;-%xs@QIA#l`Dcl9~%N z5h5$3$;Fxp5&)U1!EGe0S6q@`l&XhpLJ&m7W_g=M%ppqtT*9su$*DQ66$SZ4C2(_u zxL8sWOA>*`Flz7wf!RVpvAo3GR0$@a7-tZeEhNCjoLihO!3-7xF^%R3Z$4tr!N!<3 z`K+s!uoTn*NOo-g@A{l6UC4xs+dZ`eU7 utils.NumberZero { + if checkProvince { + w.Eq["sale_province"] = strconv.Itoa(int(u.SaleProvince)) + } else { + w.Eq["group_id"] = strconv.Itoa(int(u.GroupId)) + } + } +} diff --git a/services/order/internal/logic/itemsLogic.go b/services/order/internal/logic/itemsLogic.go index b46a5e9..044583d 100644 --- a/services/order/internal/logic/itemsLogic.go +++ b/services/order/internal/logic/itemsLogic.go @@ -81,6 +81,8 @@ func (l *ItemsLogic) Items(in *order.OrderItemsRequest) (*order.Response, error) w.Other["create_time < ?"] = strconv.Itoa(int(in.Time[utils.NumberOne])) } + l.SetWhere(&w, adminInfo) + items, err := model.OrderModel{}.Init().Page(w, &info) if err != nil { l.Logger.Error(err) diff --git a/services/sale/run.toml b/services/sale/run.toml deleted file mode 100644 index 6f83ec6..0000000 --- a/services/sale/run.toml +++ /dev/null @@ -1,59 +0,0 @@ -[base] - login_out_time=43200 #api接口超时时间分 - login_refresh_out_time=83200 - name = "sale-service" - listenOn = "0.0.0.0:10300" - mode = "dev" -[log] - path = "logs" - serviceName = "sale-service" - mode = "file" - encoding = "plain" - level = "info" - keepDays = 7 - maxSize = 50 - maxBackups = 5 - compress = false - -[oss] - accessKeyId = "LTAI5t7U8KvxSiPE5auwQUuu" - accessKeySecret = "xjfgbQQRpL4TcIspNuClg6bYADa3pk" - roleArn = "acs:ram::1663896742753915:role/oss-upload" - roleSessionName = "oss-upload" - region = "oss-cn-hangzhou" - bucketName = "lone-images" - endpoint = "https://oss-accelerate.aliyuncs.com" - host = "https://images.ailuowan.com" - dir = "upload/" - expireSeconds = 3600 - -[mysql] - host = '39.106.171.204' - port = 33066 - user = 'root' - password = 'MOLXRZNOU4Y4' - database = 'dms-sale' - charset = 'utf8mb4' - prefix = '' - debug = true -[mysql_read] - host = '39.106.171.204' - port = 33066 - user = 'root' - password = 'MOLXRZNOU4Y4' - database = 'dms-sale' - charset = 'utf8mb4' - prefix = '' - -[redis] - host = '39.106.171.204' - password = 'lLMLcuPpzSj' - port = 6379 - db = 0 - -[encrypt] - data_key = "u2t9T3luZtoRfhBstkFN6TiIMW38BA8a" - -[services] - chore = "chore-service" - user = "user-service" \ No newline at end of file diff --git a/services/store/internal/model/salesPersonHistory.go b/services/store/internal/model/saleChangeHistory.go similarity index 100% rename from services/store/internal/model/salesPersonHistory.go rename to services/store/internal/model/saleChangeHistory.go diff --git a/services/user/.gitignore b/services/user/.gitignore index 9ec6736..e4a1273 100644 --- a/services/user/.gitignore +++ b/services/user/.gitignore @@ -1,2 +1,3 @@ run.toml -etc/user.yaml \ No newline at end of file +etc/user.yaml +tmp \ No newline at end of file