增加流量带宽子账单接口/把 regionId 改为 nodeRegionId

This commit is contained in:
刘祥超
2022-10-14 16:17:18 +08:00
parent a5af5e0597
commit 387ee8d9c9
15 changed files with 4655 additions and 4013 deletions

View File

@@ -35,10 +35,10 @@ type CalculatePriceRequest struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
PriceType string `protobuf:"bytes,1,opt,name=priceType,proto3" json:"priceType,omitempty"`
TrafficGB float32 `protobuf:"fixed32,2,opt,name=trafficGB,proto3" json:"trafficGB,omitempty"`
BandwidthMB float32 `protobuf:"fixed32,3,opt,name=bandwidthMB,proto3" json:"bandwidthMB,omitempty"`
RegionId int64 `protobuf:"varint,4,opt,name=regionId,proto3" json:"regionId,omitempty"`
PriceType string `protobuf:"bytes,1,opt,name=priceType,proto3" json:"priceType,omitempty"`
TrafficGB float32 `protobuf:"fixed32,2,opt,name=trafficGB,proto3" json:"trafficGB,omitempty"`
BandwidthMB float32 `protobuf:"fixed32,3,opt,name=bandwidthMB,proto3" json:"bandwidthMB,omitempty"`
NodeRegionId int64 `protobuf:"varint,4,opt,name=nodeRegionId,proto3" json:"nodeRegionId,omitempty"`
}
func (x *CalculatePriceRequest) Reset() {
@@ -94,9 +94,9 @@ func (x *CalculatePriceRequest) GetBandwidthMB() float32 {
return 0
}
func (x *CalculatePriceRequest) GetRegionId() int64 {
func (x *CalculatePriceRequest) GetNodeRegionId() int64 {
if x != nil {
return x.RegionId
return x.NodeRegionId
}
return 0
}
@@ -106,8 +106,8 @@ type CalculatePriceResponse struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Amount float32 `protobuf:"fixed32,1,opt,name=amount,proto3" json:"amount,omitempty"`
HasRegionPrice bool `protobuf:"varint,2,opt,name=hasRegionPrice,proto3" json:"hasRegionPrice,omitempty"`
Amount float32 `protobuf:"fixed32,1,opt,name=amount,proto3" json:"amount,omitempty"`
HasNodeRegionPrice bool `protobuf:"varint,2,opt,name=hasNodeRegionPrice,proto3" json:"hasNodeRegionPrice,omitempty"`
}
func (x *CalculatePriceResponse) Reset() {
@@ -149,9 +149,9 @@ func (x *CalculatePriceResponse) GetAmount() float32 {
return 0
}
func (x *CalculatePriceResponse) GetHasRegionPrice() bool {
func (x *CalculatePriceResponse) GetHasNodeRegionPrice() bool {
if x != nil {
return x.HasRegionPrice
return x.HasNodeRegionPrice
}
return false
}
@@ -160,7 +160,7 @@ var File_service_price_proto protoreflect.FileDescriptor
var file_service_price_proto_rawDesc = []byte{
0x0a, 0x13, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x91, 0x01, 0x0a, 0x15, 0x43, 0x61,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x99, 0x01, 0x0a, 0x15, 0x43, 0x61,
0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70,
@@ -168,13 +168,14 @@ var file_service_price_proto_rawDesc = []byte{
0x20, 0x01, 0x28, 0x02, 0x52, 0x09, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x47, 0x42, 0x12,
0x20, 0x0a, 0x0b, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x4d, 0x42, 0x18, 0x03,
0x20, 0x01, 0x28, 0x02, 0x52, 0x0b, 0x62, 0x61, 0x6e, 0x64, 0x77, 0x69, 0x64, 0x74, 0x68, 0x4d,
0x42, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x04, 0x20,
0x01, 0x28, 0x03, 0x52, 0x08, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x58, 0x0a,
0x16, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52,
0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x26, 0x0a, 0x0e, 0x68, 0x61, 0x73, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x69, 0x63,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x68, 0x61, 0x73, 0x52, 0x65, 0x67, 0x69,
0x42, 0x12, 0x22, 0x0a, 0x0c, 0x6e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x49,
0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x67,
0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x60, 0x0a, 0x16, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61,
0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x02, 0x52,
0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x68, 0x61, 0x73, 0x4e, 0x6f,
0x64, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x08, 0x52, 0x12, 0x68, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x67, 0x69,
0x6f, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x32, 0x57, 0x0a, 0x0c, 0x50, 0x72, 0x69, 0x63, 0x65,
0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x47, 0x0a, 0x0e, 0x63, 0x61, 0x6c, 0x63, 0x75,
0x6c, 0x61, 0x74, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x2e, 0x43,