zzw/lone-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: sale create fields
CI / changes (push) Successful in 14s
Details
CI / docker-bff (push) Successful in 3s
Details
CI / docker-product (push) Successful in 24s
Details
CI / docker-admin (push) Has been skipped
Details
CI / docker-user (push) Has been skipped
Details
CI / docker-ad (push) Has been skipped
Details
CI / docker-chore (push) Successful in 25s
Details
CI / docker-express (push) Has been skipped
Details
CI / docker-sale (push) Successful in 26s
Details

Browse Source
This commit is contained in:
zzw
2026-08-28 15:35:33 +08:00
parent 914a11d05a
commit 53d203ee14
20 changed files with 542 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpc/sale/pb/sale.pb.go
+15 -89
View File
@@ -399,13 +399,9 @@ type CreateReq struct {
SaleId int64 `protobuf:"varint,9,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"`
Type uint32 `protobuf:"varint,10,opt,name=type,proto3" json:"type,omitempty"`
TerritoryId int64 `protobuf:"varint,11,opt,name=territory_id,json=territoryId,proto3" json:"territory_id,omitempty"`
TerritoryName string `protobuf:"bytes,12,opt,name=territory_name,json=territoryName,proto3" json:"territory_name,omitempty"`
ProvinceId int64 `protobuf:"varint,13,opt,name=province_id,json=provinceId,proto3" json:"province_id,omitempty"`
CityId int64 `protobuf:"varint,14,opt,name=city_id,json=cityId,proto3" json:"city_id,omitempty"`
DistrictId int64 `protobuf:"varint,15,opt,name=district_id,json=districtId,proto3" json:"district_id,omitempty"`
RegionProvince string `protobuf:"bytes,16,opt,name=region_province,json=regionProvince,proto3" json:"region_province,omitempty"`
RegionCity string `protobuf:"bytes,17,opt,name=region_city,json=regionCity,proto3" json:"region_city,omitempty"`
RegionDistrict string `protobuf:"bytes,18,opt,name=region_district,json=regionDistrict,proto3" json:"region_district,omitempty"`
Address string `protobuf:"bytes,19,opt,name=address,proto3" json:"address,omitempty"`
IdCardBack string `protobuf:"bytes,20,opt,name=id_card_back,json=idCardBack,proto3" json:"id_card_back,omitempty"`
BusinessLicense string `protobuf:"bytes,21,opt,name=business_license,json=businessLicense,proto3" json:"business_license,omitempty"`
@@ -520,13 +516,6 @@ func (x *CreateReq) GetTerritoryId() int64 {
return 0
}
func (x *CreateReq) GetTerritoryName() string {
if x != nil {
return x.TerritoryName
}
return ""
}
func (x *CreateReq) GetProvinceId() int64 {
if x != nil {
return x.ProvinceId
@@ -548,27 +537,6 @@ func (x *CreateReq) GetDistrictId() int64 {
return 0
}
func (x *CreateReq) GetRegionProvince() string {
if x != nil {
return x.RegionProvince
}
return ""
}
func (x *CreateReq) GetRegionCity() string {
if x != nil {
return x.RegionCity
}
return ""
}
func (x *CreateReq) GetRegionDistrict() string {
if x != nil {
return x.RegionDistrict
}
return ""
}
func (x *CreateReq) GetAddress() string {
if x != nil {
return x.Address
@@ -603,13 +571,9 @@ type EditReq struct {
SaleId int64 `protobuf:"varint,9,opt,name=sale_id,json=saleId,proto3" json:"sale_id,omitempty"`
Type uint32 `protobuf:"varint,10,opt,name=type,proto3" json:"type,omitempty"`
TerritoryId int64 `protobuf:"varint,11,opt,name=territory_id,json=territoryId,proto3" json:"territory_id,omitempty"`
TerritoryName string `protobuf:"bytes,12,opt,name=territory_name,json=territoryName,proto3" json:"territory_name,omitempty"`
ProvinceId int64 `protobuf:"varint,13,opt,name=province_id,json=provinceId,proto3" json:"province_id,omitempty"`
CityId int64 `protobuf:"varint,14,opt,name=city_id,json=cityId,proto3" json:"city_id,omitempty"`
DistrictId int64 `protobuf:"varint,15,opt,name=district_id,json=districtId,proto3" json:"district_id,omitempty"`
RegionProvince string `protobuf:"bytes,16,opt,name=region_province,json=regionProvince,proto3" json:"region_province,omitempty"`
RegionCity string `protobuf:"bytes,17,opt,name=region_city,json=regionCity,proto3" json:"region_city,omitempty"`
RegionDistrict string `protobuf:"bytes,18,opt,name=region_district,json=regionDistrict,proto3" json:"region_district,omitempty"`
Address string `protobuf:"bytes,19,opt,name=address,proto3" json:"address,omitempty"`
IdCardBack string `protobuf:"bytes,20,opt,name=id_card_back,json=idCardBack,proto3" json:"id_card_back,omitempty"`
BusinessLicense string `protobuf:"bytes,21,opt,name=business_license,json=businessLicense,proto3" json:"business_license,omitempty"`
@@ -724,13 +688,6 @@ func (x *EditReq) GetTerritoryId() int64 {
return 0
}
func (x *EditReq) GetTerritoryName() string {
if x != nil {
return x.TerritoryName
}
return ""
}
func (x *EditReq) GetProvinceId() int64 {
if x != nil {
return x.ProvinceId
@@ -752,27 +709,6 @@ func (x *EditReq) GetDistrictId() int64 {
return 0
}
func (x *EditReq) GetRegionProvince() string {
if x != nil {
return x.RegionProvince
}
return ""
}
func (x *EditReq) GetRegionCity() string {
if x != nil {
return x.RegionCity
}
return ""
}
func (x *EditReq) GetRegionDistrict() string {
if x != nil {
return x.RegionDistrict
}
return ""
}
func (x *EditReq) GetAddress() string {
if x != nil {
return x.Address
@@ -1379,7 +1315,7 @@ const file_sale_sale_proto_rawDesc = "" +
"\x06mobile\x18\x02 \x01(\tR\x06mobile\x12\x12\n" +
"\x04name\x18\x03 \x01(\tR\x04name\"1\n" +
"\tNamesData\x12$\n" +
"\x05items\x18\x01 \x03(\v2\x0e.sale.NameItemR\x05items\"\x89\x05\n" +
"\x05items\x18\x01 \x03(\v2\x0e.sale.NameItemR\x05items\"\xef\x03\n" +
"\tCreateReq\x12\x16\n" +
"\x06mobile\x18\x01 \x01(\tR\x06mobile\x12\x12\n" +
"\x04name\x18\x02 \x01(\tR\x04name\x12\"\n" +
@@ -1393,21 +1329,16 @@ const file_sale_sale_proto_rawDesc = "" +
"\asale_id\x18\t \x01(\x03R\x06saleId\x12\x12\n" +
"\x04type\x18\n" +
" \x01(\rR\x04type\x12!\n" +
"\fterritory_id\x18\v \x01(\x03R\vterritoryId\x12%\n" +
"\x0eterritory_name\x18\f \x01(\tR\rterritoryName\x12\x1f\n" +
"\fterritory_id\x18\v \x01(\x03R\vterritoryId\x12\x1f\n" +
"\vprovince_id\x18\r \x01(\x03R\n" +
"provinceId\x12\x17\n" +
"\acity_id\x18\x0e \x01(\x03R\x06cityId\x12\x1f\n" +
"\vdistrict_id\x18\x0f \x01(\x03R\n" +
"districtId\x12'\n" +
"\x0fregion_province\x18\x10 \x01(\tR\x0eregionProvince\x12\x1f\n" +
"\vregion_city\x18\x11 \x01(\tR\n" +
"regionCity\x12'\n" +
"\x0fregion_district\x18\x12 \x01(\tR\x0eregionDistrict\x12\x18\n" +
"districtId\x12\x18\n" +
"\aaddress\x18\x13 \x01(\tR\aaddress\x12 \n" +
"\fid_card_back\x18\x14 \x01(\tR\n" +
"idCardBack\x12)\n" +
"\x10business_license\x18\x15 \x01(\tR\x0fbusinessLicense\"\xfb\x04\n" +
"\x10business_license\x18\x15 \x01(\tR\x0fbusinessLicense\"\xe1\x03\n" +
"\aEditReq\x12\x0e\n" +
"\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" +
"\x06mobile\x18\x02 \x01(\tR\x06mobile\x12\x12\n" +
@@ -1421,17 +1352,12 @@ const file_sale_sale_proto_rawDesc = "" +
"\asale_id\x18\t \x01(\x03R\x06saleId\x12\x12\n" +
"\x04type\x18\n" +
" \x01(\rR\x04type\x12!\n" +
"\fterritory_id\x18\v \x01(\x03R\vterritoryId\x12%\n" +
"\x0eterritory_name\x18\f \x01(\tR\rterritoryName\x12\x1f\n" +
"\fterritory_id\x18\v \x01(\x03R\vterritoryId\x12\x1f\n" +
"\vprovince_id\x18\r \x01(\x03R\n" +
"provinceId\x12\x17\n" +
"\acity_id\x18\x0e \x01(\x03R\x06cityId\x12\x1f\n" +
"\vdistrict_id\x18\x0f \x01(\x03R\n" +
"districtId\x12'\n" +
"\x0fregion_province\x18\x10 \x01(\tR\x0eregionProvince\x12\x1f\n" +
"\vregion_city\x18\x11 \x01(\tR\n" +
"regionCity\x12'\n" +
"\x0fregion_district\x18\x12 \x01(\tR\x0eregionDistrict\x12\x18\n" +
"districtId\x12\x18\n" +
"\aaddress\x18\x13 \x01(\tR\aaddress\x12 \n" +
"\fid_card_back\x18\x14 \x01(\tR\n" +
"idCardBack\x12)\n" +
@@ -1504,10 +1430,10 @@ const file_sale_sale_proto_rawDesc = "" +
"\rNamesInternal\x12\x0e.sale.NamesReq\x1a\x0f.sale.NamesData\x12E\n" +
"\x06Create\x12\x0f.sale.CreateReq\x1a\x0e.sale.Response\"\x1a\x82\xd3\xe4\x93\x02\x14:\x01*\"\x0f/admin/v3/sales\x12A\n" +
"\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\x12-\n" +
"\fInfoInternal\x12\r.sale.InfoReq\x1a\x0e.sale.InfoData\x12C\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/statusB\x18Z\x16lone-services/rpc/saleb\x06proto3"
"\x06Status\x12\x0f.sale.StatusReq\x1a\x0e.sale.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x1a\x16/admin/v3/sales/status\x12-\n" +
"\fInfoInternal\x12\r.sale.InfoReq\x1a\x0e.sale.InfoDataB\x18Z\x16lone-services/rpc/saleb\x06proto3"
var (
file_sale_sale_proto_rawDescOnce sync.Once
@@ -1552,9 +1478,9 @@ var file_sale_sale_proto_depIdxs = []int32{
7, // 9: sale.Sale.Create:input_type -> sale.CreateReq
8, // 10: sale.Sale.Edit:input_type -> sale.EditReq
9, // 11: sale.Sale.Info:input_type -> sale.InfoReq
9, // 12: sale.Sale.InfoInternal:input_type -> sale.InfoReq
13, // 13: sale.Sale.Items:input_type -> sale.ItemsReq
14, // 14: sale.Sale.Status:input_type -> sale.StatusReq
13, // 12: sale.Sale.Items:input_type -> sale.ItemsReq
14, // 13: sale.Sale.Status:input_type -> sale.StatusReq
9, // 14: sale.Sale.InfoInternal:input_type -> sale.InfoReq
0, // 15: sale.Sale.GroupItems:output_type -> sale.Response
0, // 16: sale.Sale.GroupCreate:output_type -> sale.Response
0, // 17: sale.Sale.GroupNames:output_type -> sale.Response
@@ -1564,9 +1490,9 @@ var file_sale_sale_proto_depIdxs = []int32{
0, // 21: sale.Sale.Create:output_type -> sale.Response
0, // 22: sale.Sale.Edit:output_type -> sale.Response
0, // 23: sale.Sale.Info:output_type -> sale.Response
12, // 24: sale.Sale.InfoInternal:output_type -> sale.InfoData
0, // 25: sale.Sale.Items:output_type -> sale.Response
0, // 26: sale.Sale.Status:output_type -> sale.Response
0, // 24: sale.Sale.Items:output_type -> sale.Response
0, // 25: sale.Sale.Status:output_type -> sale.Response
12, // 26: sale.Sale.InfoInternal:output_type -> sale.InfoData
15, // [15:27] is the sub-list for method output_type
3, // [3:15] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name
rpc/sale/pb/sale_grpc.pb.go
+40 -40
View File
@@ -28,9 +28,9 @@ const (
Sale_Create_FullMethodName = "/sale.Sale/Create"
Sale_Edit_FullMethodName = "/sale.Sale/Edit"
Sale_Info_FullMethodName = "/sale.Sale/Info"
Sale_InfoInternal_FullMethodName = "/sale.Sale/InfoInternal"
Sale_Items_FullMethodName = "/sale.Sale/Items"
Sale_Status_FullMethodName = "/sale.Sale/Status"
Sale_InfoInternal_FullMethodName = "/sale.Sale/InfoInternal"
)
// SaleClient is the client API for Sale service.
@@ -48,10 +48,10 @@ type SaleClient interface {
Create(ctx context.Context, in *CreateReq, opts ...grpc.CallOption) (*Response, error)
Edit(ctx context.Context, in *EditReq, opts ...grpc.CallOption) (*Response, error)
Info(ctx context.Context, in *InfoReq, opts ...grpc.CallOption) (*Response, error)
// 服务间调用：销售详情（含分组；mobile 脱敏，origin_mobile 为加密串）
InfoInternal(ctx context.Context, in *InfoReq, opts ...grpc.CallOption) (*InfoData, error)
Items(ctx context.Context, in *ItemsReq, opts ...grpc.CallOption) (*Response, error)
Status(ctx context.Context, in *StatusReq, opts ...grpc.CallOption) (*Response, error)
// 销售详情
InfoInternal(ctx context.Context, in *InfoReq, opts ...grpc.CallOption) (*InfoData, error)
}
type saleClient struct {
@@ -152,16 +152,6 @@ func (c *saleClient) Info(ctx context.Context, in *InfoReq, opts ...grpc.CallOpt
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)
err := c.cc.Invoke(ctx, Sale_InfoInternal_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *saleClient) Items(ctx context.Context, in *ItemsReq, opts ...grpc.CallOption) (*Response, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(Response)
@@ -182,6 +172,16 @@ func (c *saleClient) Status(ctx context.Context, in *StatusReq, opts ...grpc.Cal
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)
err := c.cc.Invoke(ctx, Sale_InfoInternal_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
// SaleServer is the server API for Sale service.
// All implementations must embed UnimplementedSaleServer
// for forward compatibility.
@@ -197,10 +197,10 @@ type SaleServer interface {
Create(context.Context, *CreateReq) (*Response, error)
Edit(context.Context, *EditReq) (*Response, error)
Info(context.Context, *InfoReq) (*Response, error)
// 服务间调用：销售详情（含分组；mobile 脱敏，origin_mobile 为加密串）
InfoInternal(context.Context, *InfoReq) (*InfoData, error)
Items(context.Context, *ItemsReq) (*Response, error)
Status(context.Context, *StatusReq) (*Response, error)
// 销售详情
InfoInternal(context.Context, *InfoReq) (*InfoData, error)
mustEmbedUnimplementedSaleServer()
}
@@ -238,15 +238,15 @@ func (UnimplementedSaleServer) Edit(context.Context, *EditReq) (*Response, error
func (UnimplementedSaleServer) Info(context.Context, *InfoReq) (*Response, error) {
return nil, status.Error(codes.Unimplemented, "method Info not implemented")
}
func (UnimplementedSaleServer) InfoInternal(context.Context, *InfoReq) (*InfoData, error) {
return nil, status.Error(codes.Unimplemented, "method InfoInternal not implemented")
}
func (UnimplementedSaleServer) Items(context.Context, *ItemsReq) (*Response, error) {
return nil, status.Error(codes.Unimplemented, "method Items not implemented")
}
func (UnimplementedSaleServer) Status(context.Context, *StatusReq) (*Response, error) {
return nil, status.Error(codes.Unimplemented, "method Status not implemented")
}
func (UnimplementedSaleServer) InfoInternal(context.Context, *InfoReq) (*InfoData, error) {
return nil, status.Error(codes.Unimplemented, "method InfoInternal not implemented")
}
func (UnimplementedSaleServer) mustEmbedUnimplementedSaleServer() {}
func (UnimplementedSaleServer) testEmbeddedByValue() {}
@@ -430,24 +430,6 @@ func _Sale_Info_Handler(srv interface{}, ctx context.Context, dec func(interface
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 {
return nil, err
}
if interceptor == nil {
return srv.(SaleServer).InfoInternal(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: Sale_InfoInternal_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SaleServer).InfoInternal(ctx, req.(*InfoReq))
}
return interceptor(ctx, in, info, handler)
}
func _Sale_Items_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ItemsReq)
if err := dec(in); err != nil {
@@ -484,6 +466,24 @@ func _Sale_Status_Handler(srv interface{}, ctx context.Context, dec func(interfa
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 {
return nil, err
}
if interceptor == nil {
return srv.(SaleServer).InfoInternal(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: Sale_InfoInternal_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SaleServer).InfoInternal(ctx, req.(*InfoReq))
}
return interceptor(ctx, in, info, handler)
}
// Sale_ServiceDesc is the grpc.ServiceDesc for Sale service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -527,10 +527,6 @@ var Sale_ServiceDesc = grpc.ServiceDesc{
MethodName: "Info",
Handler: _Sale_Info_Handler,
},
{
MethodName: "InfoInternal",
Handler: _Sale_InfoInternal_Handler,
},
{
MethodName: "Items",
Handler: _Sale_Items_Handler,
@@ -539,6 +535,10 @@ var Sale_ServiceDesc = grpc.ServiceDesc{
MethodName: "Status",
Handler: _Sale_Status_Handler,
},
{
MethodName: "InfoInternal",
Handler: _Sale_InfoInternal_Handler,
},
},
Streams: []grpc.StreamDesc{},
Metadata: "sale/sale.proto",
rpc/sale/sale.pb
BIN
View File
Binary file not shown.
rpc/sale/sale.proto
+3 -10
View File
@@ -57,8 +57,6 @@ service Sale {
body: "*"
};
}
// 服务间调用：销售详情（含分组；mobile 脱敏，origin_mobile 为加密串）
rpc InfoInternal(InfoReq) returns (InfoData);
rpc Items(ItemsReq) returns (Response) {
option (google.api.http) = {
get: "/admin/v3/sales"
@@ -71,6 +69,9 @@ service Sale {
body: "*"
};
}
// 销售详情
rpc InfoInternal(InfoReq) returns (InfoData);
}
message Response {
@@ -119,13 +120,9 @@ message CreateReq {
int64 sale_id = 9;
uint32 type = 10;
int64 territory_id = 11;
string territory_name = 12;
int64 province_id = 13;
int64 city_id = 14;
int64 district_id = 15;
string region_province = 16;
string region_city = 17;
string region_district = 18;
string address = 19;
string id_card_back = 20;
string business_license = 21;
@@ -143,13 +140,9 @@ message EditReq {
int64 sale_id = 9;
uint32 type = 10;
int64 territory_id = 11;
string territory_name = 12;
int64 province_id = 13;
int64 city_id = 14;
int64 district_id = 15;
string region_province = 16;
string region_city = 17;
string region_district = 18;
string address = 19;
string id_card_back = 20;
string business_license = 21;