Merge branch 'dev-lzh' into dev

api/bundle/bundle.pb.go

@@ -4237,6 +4237,261 @@ func (x *GetBundleBalanceResp) GetData() []*BundleBalanceItem {
 	return nil
 }
 
+func (x *GetBundleBalanceReq) GetUserName() string {
+	if x != nil {
+		return x.UserName
+	}
+	return ""
+}
+
+func (x *GetBundleBalanceReq) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
+func (x *GetBundleBalanceReq) GetBundleName() string {
+	if x != nil {
+		return x.BundleName
+	}
+	return ""
+}
+
+func (x *GetBundleBalanceReq) GetExpiredTimeStart() int64 {
+	if x != nil {
+		return x.ExpiredTimeStart
+	}
+	return 0
+}
+
+func (x *GetBundleBalanceReq) GetExpiredTimeEnd() int64 {
+	if x != nil {
+		return x.ExpiredTimeEnd
+	}
+	return 0
+}
+
+func (x *GetBundleBalanceReq) GetPage() int32 {
+	if x != nil {
+		return x.Page
+	}
+	return 0
+}
+
+func (x *GetBundleBalanceReq) GetPageSize() int32 {
+	if x != nil {
+		return x.PageSize
+	}
+	return 0
+}
+
+type BundleBalanceItem struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	UserName                      string `protobuf:"bytes,1,opt,name=userName,proto3" json:"userName"`
+	UserPhoneNumber               string `protobuf:"bytes,2,opt,name=userPhoneNumber,proto3" json:"userPhoneNumber"`
+	Status                        int32  `protobuf:"varint,3,opt,name=status,proto3" json:"status"`
+	BundleName                    string `protobuf:"bytes,4,opt,name=bundleName,proto3" json:"bundleName"`
+	ExpiredTime                   int64  `protobuf:"varint,5,opt,name=expiredTime,proto3" json:"expiredTime"`
+	AccountNumber                 int32  `protobuf:"varint,6,opt,name=accountNumber,proto3" json:"accountNumber"`
+	AccountConsumptionNumber      int32  `protobuf:"varint,7,opt,name=accountConsumptionNumber,proto3" json:"accountConsumptionNumber"`
+	VideoNumber                   int32  `protobuf:"varint,8,opt,name=videoNumber,proto3" json:"videoNumber"`
+	VideoConsumptionNumber        int32  `protobuf:"varint,9,opt,name=videoConsumptionNumber,proto3" json:"videoConsumptionNumber"`
+	ImageNumber                   int32  `protobuf:"varint,10,opt,name=imageNumber,proto3" json:"imageNumber"`
+	ImageConsumptionNumber        int32  `protobuf:"varint,11,opt,name=imageConsumptionNumber,proto3" json:"imageConsumptionNumber"`
+	DataAnalysisNumber            int32  `protobuf:"varint,12,opt,name=dataAnalysisNumber,proto3" json:"dataAnalysisNumber"`
+	DataAnalysisConsumptionNumber int32  `protobuf:"varint,13,opt,name=dataAnalysisConsumptionNumber,proto3" json:"dataAnalysisConsumptionNumber"`
+	ExpansionPacksNumber          int32  `protobuf:"varint,14,opt,name=expansionPacksNumber,proto3" json:"expansionPacksNumber"`
+}
+
+func (x *BundleBalanceItem) Reset() {
+	*x = BundleBalanceItem{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pb_bundle_proto_msgTypes[39]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BundleBalanceItem) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BundleBalanceItem) ProtoMessage() {}
+
+func (x *BundleBalanceItem) ProtoReflect() protoreflect.Message {
+	mi := &file_pb_bundle_proto_msgTypes[39]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BundleBalanceItem.ProtoReflect.Descriptor instead.
+func (*BundleBalanceItem) Descriptor() ([]byte, []int) {
+	return file_pb_bundle_proto_rawDescGZIP(), []int{39}
+}
+
+func (x *BundleBalanceItem) GetUserName() string {
+	if x != nil {
+		return x.UserName
+	}
+	return ""
+}
+
+func (x *BundleBalanceItem) GetUserPhoneNumber() string {
+	if x != nil {
+		return x.UserPhoneNumber
+	}
+	return ""
+}
+
+func (x *BundleBalanceItem) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetBundleName() string {
+	if x != nil {
+		return x.BundleName
+	}
+	return ""
+}
+
+func (x *BundleBalanceItem) GetExpiredTime() int64 {
+	if x != nil {
+		return x.ExpiredTime
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetAccountNumber() int32 {
+	if x != nil {
+		return x.AccountNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetAccountConsumptionNumber() int32 {
+	if x != nil {
+		return x.AccountConsumptionNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetVideoNumber() int32 {
+	if x != nil {
+		return x.VideoNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetVideoConsumptionNumber() int32 {
+	if x != nil {
+		return x.VideoConsumptionNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetImageNumber() int32 {
+	if x != nil {
+		return x.ImageNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetImageConsumptionNumber() int32 {
+	if x != nil {
+		return x.ImageConsumptionNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetDataAnalysisNumber() int32 {
+	if x != nil {
+		return x.DataAnalysisNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetDataAnalysisConsumptionNumber() int32 {
+	if x != nil {
+		return x.DataAnalysisConsumptionNumber
+	}
+	return 0
+}
+
+func (x *BundleBalanceItem) GetExpansionPacksNumber() int32 {
+	if x != nil {
+		return x.ExpansionPacksNumber
+	}
+	return 0
+}
+
+type GetBundleBalanceResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Total int64                `protobuf:"varint,1,opt,name=total,proto3" json:"total"`
+	Data  []*BundleBalanceItem `protobuf:"bytes,2,rep,name=data,proto3" json:"data"`
+}
+
+func (x *GetBundleBalanceResp) Reset() {
+	*x = GetBundleBalanceResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pb_bundle_proto_msgTypes[40]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GetBundleBalanceResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GetBundleBalanceResp) ProtoMessage() {}
+
+func (x *GetBundleBalanceResp) ProtoReflect() protoreflect.Message {
+	mi := &file_pb_bundle_proto_msgTypes[40]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GetBundleBalanceResp.ProtoReflect.Descriptor instead.
+func (*GetBundleBalanceResp) Descriptor() ([]byte, []int) {
+	return file_pb_bundle_proto_rawDescGZIP(), []int{40}
+}
+
+func (x *GetBundleBalanceResp) GetTotal() int64 {
+	if x != nil {
+		return x.Total
+	}
+	return 0
+}
+
+func (x *GetBundleBalanceResp) GetData() []*BundleBalanceItem {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_pb_bundle_proto protoreflect.FileDescriptor
 
 var file_pb_bundle_proto_rawDesc = []byte{

pkg/router/bundle.go

@@ -39,12 +39,12 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleAppRouteV2.POST("bundle-detail", bundle.BundleDetailV2)
 		}
 
-		bundleExtend := bundleAppRoute.Group("extend")
+		bundleExtend := bundleRoute.Group("extend")
 		{
 			bundleExtend.POST("", bundle.BundleExtend)
 			bundleExtend.POST("list", bundle.BundleExtendRecordsList)
-			bundleExtend.POST("balance", bundle.GetBundleBalance)
 		}
+		bundleRoute.POST("balance", bundle.GetBundleBalance)
 	}
 
 }