From 4bea83a1a6220ccd6906296d8195e2cf45a93abe Mon Sep 17 00:00:00 2001 From: univero <1449610641@qq.com> Date: Wed, 4 Dec 2024 16:22:13 +0800 Subject: [PATCH] =?UTF-8?q?upgrade:=20=E4=BF=AE=E6=AD=A3=E4=BA=86=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biz/application/dto/openapi/core_api/common.pb.go | 10 +++++----- biz/application/service/charge.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/biz/application/dto/openapi/core_api/common.pb.go b/biz/application/dto/openapi/core_api/common.pb.go index 78a179e..7691ac7 100644 --- a/biz/application/dto/openapi/core_api/common.pb.go +++ b/biz/application/dto/openapi/core_api/common.pb.go @@ -1868,7 +1868,7 @@ type GetAmountReq struct { unknownFields protoimpl.UnknownFields Increment int64 `protobuf:"varint,1,opt,name=increment,proto3" form:"increment" json:"increment" query:"increment"` - BaseInfId string `protobuf:"bytes,2,opt,name=baseInfId,proto3" form:"baseInfId" json:"baseInfId" query:"baseInfId"` + FullInfId string `protobuf:"bytes,2,opt,name=fullInfId,proto3" form:"fullInfId" json:"fullInfId" query:"fullInfId"` } func (x *GetAmountReq) Reset() { @@ -1910,9 +1910,9 @@ func (x *GetAmountReq) GetIncrement() int64 { return 0 } -func (x *GetAmountReq) GetBaseInfId() string { +func (x *GetAmountReq) GetFullInfId() string { if x != nil { - return x.BaseInfId + return x.FullInfId } return "" } @@ -2531,8 +2531,8 @@ var file_openapi_core_api_common_proto_rawDesc = []byte{ 0x65, 0x6e, 0x74, 0x22, 0x4a, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x49, 0x64, 0x22, + 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x41, 0x6d, diff --git a/biz/application/service/charge.go b/biz/application/service/charge.go index 953c14f..334a0ec 100644 --- a/biz/application/service/charge.go +++ b/biz/application/service/charge.go @@ -134,7 +134,7 @@ func (s *ChargeService) BuyFullInterface(ctx context.Context, req *core_api.BuyF amountResp, err2 := s.ChargeClient.GetAmount(ctx, &gencharge.GetAmountReq{ Increment: increment, - BaseInfId: fullInf.BaseInterfaceId, + FullInfId: fullInfId, }) if err2 != nil { return nil, err2 @@ -359,11 +359,11 @@ func (s *ChargeService) GetGradient(ctx context.Context, req *core_api.GetGradie } func (s *ChargeService) GetAmount(ctx context.Context, req *core_api.GetAmountReq) (*core_api.GetAmountResp, error) { - baseInfId := req.BaseInfId + fullInfId := req.FullInfId increment := req.Increment amountResp, err := s.ChargeClient.GetAmount(ctx, &gencharge.GetAmountReq{ Increment: increment, - BaseInfId: baseInfId, + FullInfId: fullInfId, }) if err != nil { return nil, err diff --git a/go.mod b/go.mod index 7124c25..3a7c4e5 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/rabbitmq/amqp091-go v1.10.0 github.com/xh-polaris/gopkg v0.0.0-20231209130217-cd07835dcd83 github.com/xh-polaris/meowchat-core-api v1.0.78 - github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204074118-6d7c7c0f5df5 + github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204081619-6c45743ef911 github.com/zeromicro/go-zero v1.7.2 go.mongodb.org/mongo-driver v1.16.1 go.opentelemetry.io/contrib/propagators/b3 v1.20.0 diff --git a/go.sum b/go.sum index 56bb277..4582feb 100644 --- a/go.sum +++ b/go.sum @@ -413,6 +413,10 @@ github.com/xh-polaris/service-idl-gen-go v0.0.0-20241123100835-25d5d670516a h1:a github.com/xh-polaris/service-idl-gen-go v0.0.0-20241123100835-25d5d670516a/go.mod h1:3ixuadpEpTumm8RftVwtXYH8Zfmu6shi33Hh5GKC6cU= github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204074118-6d7c7c0f5df5 h1:eH+p+SyzDb0IXVOrDwKmtdBFYz2K6aE8MulrMYW3wxQ= github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204074118-6d7c7c0f5df5/go.mod h1:3ixuadpEpTumm8RftVwtXYH8Zfmu6shi33Hh5GKC6cU= +github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204080206-0f306efde9b7 h1:1ULXo2QrOwYkURORE63UqeHNfBi3Dd61zw15x0kucpM= +github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204080206-0f306efde9b7/go.mod h1:3ixuadpEpTumm8RftVwtXYH8Zfmu6shi33Hh5GKC6cU= +github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204081619-6c45743ef911 h1:vjQ9tplmLj/sEegxV78KmIAdTrVt1rvfIG76mS6Pzrk= +github.com/xh-polaris/service-idl-gen-go v0.0.0-20241204081619-6c45743ef911/go.mod h1:3ixuadpEpTumm8RftVwtXYH8Zfmu6shi33Hh5GKC6cU= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=