internal/controller/bundleExtend.go

@@ -57,10 +57,3 @@ func (b *BundleProvider) BundleActivate(_ context.Context, req *bundle.BundleAct
 func (b *BundleProvider) BundleBalanceExport(_ context.Context, req *bundle.BundleBalanceExportReq) (*bundle.BundleBalanceExportResp, error) {
 	return logic.BundleBalanceExport(req)
 }
-
-func (b *BundleProvider) GetBundleBalanceLayout(_ context.Context, req *bundle.GetBundleBalanceLayoutReq) (*bundle.GetBundleBalanceLayoutResp, error) {
-	return logic.GetBundleBalanceLayout(req)
-}
-func (b *BundleProvider) SetBundleBalanceLayout(_ context.Context, req *bundle.SetBundleBalanceLayoutReq) (*bundle.SetBundleBalanceLayoutResp, error) {
-	return logic.SetBundleBalanceLayout(req)
-}

internal/dao/bundleExtend.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 func AddBundleExtendRecord(data model.BundleExtensionRecords) error {
@@ -620,18 +619,3 @@ left join (
 `).Scan(&data).Error
 	return
 }
-
-func GetBundleBalanceLayout(req *bundle.GetBundleBalanceLayoutReq) (string, error) {
-	data := &model.BundleBalanceLayout{}
-	if err := app.ModuleClients.BundleDB.Model(&model.BundleBalanceLayout{}).Where("user_id = ?", req.UserId).First(data).Error; err != nil {
-		return "nil", err
-	}
-	return data.Data, nil
-}
-
-func SetBundleBalanceLayout(req *bundle.SetBundleBalanceLayoutReq) error {
-	return app.ModuleClients.BundleDB.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "user_id"}},
-		DoUpdates: clause.AssignmentColumns([]string{"data"}),
-	}).Create(&model.BundleBalanceLayout{Data: req.Data, UserId: uint64(req.UserId)}).Error
-}

internal/logic/bundleExtendLogic.go

@@ -433,14 +433,3 @@ func BundleBalanceExport(req *bundle.BundleBalanceExportReq) (*bundle.BundleBala
 	}
 	return &bundle.BundleBalanceExportResp{Total: int64(len(items)), Data: items}, nil
 }
-
-func GetBundleBalanceLayout(req *bundle.GetBundleBalanceLayoutReq) (*bundle.GetBundleBalanceLayoutResp, error) {
-	data, err := dao.GetBundleBalanceLayout(req)
-	return &bundle.GetBundleBalanceLayoutResp{
-		Data: data,
-	}, err
-}
-
-func SetBundleBalanceLayout(req *bundle.SetBundleBalanceLayoutReq) (*bundle.SetBundleBalanceLayoutResp, error) {
-	return nil, dao.SetBundleBalanceLayout(req)
-}

internal/model/bundle.go

@@ -342,9 +342,3 @@ type BundleExport struct {
 	BundleExportDto
 	balance *BundleBalance
 }
-
-type BundleBalanceLayout struct {
-	gorm.Model
-	UserId uint64 `gorm:"column:user_id;not null;unique"`
-	Data   string `gorm:"column:data;not null"`
-}

pb/bundle.proto

@@ -62,8 +62,6 @@ service Bundle {
   rpc AddBundleBalance(AddBundleBalanceReq) returns (AddBundleBalanceResp) {} // 修改余量信息
   rpc BundleActivate(BundleActivateReq) returns (BundleActivateResp) {} // 用户套餐激活
   rpc BundleBalanceExport(BundleBalanceExportReq) returns (BundleBalanceExportResp) {} // 套餐余量导出
-  rpc GetBundleBalanceLayout(GetBundleBalanceLayoutReq) returns (GetBundleBalanceLayoutResp) {} // 余量布局
-  rpc SetBundleBalanceLayout(SetBundleBalanceLayoutReq) returns (SetBundleBalanceLayoutResp) {} // 余量布局
 
   // 使用记录
   rpc GetUsedRecordList(GetUsedRecordListReq) returns (GetUsedRecordListResp) {} // 获取套餐使用记录列表
@@ -1228,20 +1226,3 @@ message ArtistBundleBalanceResponse {
   int32 remainingImageCount = 2 [json_name = "remainingImageCount"]; // 剩余图片数量
   int32 remainingDataAnalysisCount = 3 [json_name = "remainingDataAnalysisCount"]; // 剩余数据分析数量
 }
-
-message SetBundleBalanceLayoutReq{
-  uint32 userId = 1;
-  string data = 2;
-}
-
-message SetBundleBalanceLayoutResp{
-
-}
-
-message GetBundleBalanceLayoutReq{
-  uint32 userId = 1;
-}
-
-message GetBundleBalanceLayoutResp{
-  string data = 1;
-}

pb/bundle/bundle.validator.pb.go

@@ -577,15 +577,3 @@ func (this *ArtistBundleBalanceRequest) Validate() error {
 func (this *ArtistBundleBalanceResponse) Validate() error {
 	return nil
 }
-func (this *SetBundleBalanceLayoutReq) Validate() error {
-	return nil
-}
-func (this *SetBundleBalanceLayoutResp) Validate() error {
-	return nil
-}
-func (this *GetBundleBalanceLayoutReq) Validate() error {
-	return nil
-}
-func (this *GetBundleBalanceLayoutResp) Validate() error {
-	return nil
-}

pb/bundle/bundle_triple.pb.go

@@ -71,8 +71,6 @@ type BundleClient interface {
 	AddBundleBalance(ctx context.Context, in *AddBundleBalanceReq, opts ...grpc_go.CallOption) (*AddBundleBalanceResp, common.ErrorWithAttachment)
 	BundleActivate(ctx context.Context, in *BundleActivateReq, opts ...grpc_go.CallOption) (*BundleActivateResp, common.ErrorWithAttachment)
 	BundleBalanceExport(ctx context.Context, in *BundleBalanceExportReq, opts ...grpc_go.CallOption) (*BundleBalanceExportResp, common.ErrorWithAttachment)
-	GetBundleBalanceLayout(ctx context.Context, in *GetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*GetBundleBalanceLayoutResp, common.ErrorWithAttachment)
-	SetBundleBalanceLayout(ctx context.Context, in *SetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*SetBundleBalanceLayoutResp, common.ErrorWithAttachment)
 	// 使用记录
 	GetUsedRecordList(ctx context.Context, in *GetUsedRecordListReq, opts ...grpc_go.CallOption) (*GetUsedRecordListResp, common.ErrorWithAttachment)
 	GetImageWorkDetail(ctx context.Context, in *GetImageWorkDetailReq, opts ...grpc_go.CallOption) (*GetImageWorkDetailResp, common.ErrorWithAttachment)
@@ -144,8 +142,6 @@ type BundleClientImpl struct {
 	AddBundleBalance                         func(ctx context.Context, in *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
 	BundleActivate                           func(ctx context.Context, in *BundleActivateReq) (*BundleActivateResp, error)
 	BundleBalanceExport                      func(ctx context.Context, in *BundleBalanceExportReq) (*BundleBalanceExportResp, error)
-	GetBundleBalanceLayout                   func(ctx context.Context, in *GetBundleBalanceLayoutReq) (*GetBundleBalanceLayoutResp, error)
-	SetBundleBalanceLayout                   func(ctx context.Context, in *SetBundleBalanceLayoutReq) (*SetBundleBalanceLayoutResp, error)
 	GetUsedRecordList                        func(ctx context.Context, in *GetUsedRecordListReq) (*GetUsedRecordListResp, error)
 	GetImageWorkDetail                       func(ctx context.Context, in *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error)
 	GetVedioWorkDetail                       func(ctx context.Context, in *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error)
@@ -420,18 +416,6 @@ func (c *bundleClient) BundleBalanceExport(ctx context.Context, in *BundleBalanc
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BundleBalanceExport", in, out)
 }
 
-func (c *bundleClient) GetBundleBalanceLayout(ctx context.Context, in *GetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*GetBundleBalanceLayoutResp, common.ErrorWithAttachment) {
-	out := new(GetBundleBalanceLayoutResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetBundleBalanceLayout", in, out)
-}
-
-func (c *bundleClient) SetBundleBalanceLayout(ctx context.Context, in *SetBundleBalanceLayoutReq, opts ...grpc_go.CallOption) (*SetBundleBalanceLayoutResp, common.ErrorWithAttachment) {
-	out := new(SetBundleBalanceLayoutResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SetBundleBalanceLayout", in, out)
-}
-
 func (c *bundleClient) GetUsedRecordList(ctx context.Context, in *GetUsedRecordListReq, opts ...grpc_go.CallOption) (*GetUsedRecordListResp, common.ErrorWithAttachment) {
 	out := new(GetUsedRecordListResp)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -599,8 +583,6 @@ type BundleServer interface {
 	AddBundleBalance(context.Context, *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
 	BundleActivate(context.Context, *BundleActivateReq) (*BundleActivateResp, error)
 	BundleBalanceExport(context.Context, *BundleBalanceExportReq) (*BundleBalanceExportResp, error)
-	GetBundleBalanceLayout(context.Context, *GetBundleBalanceLayoutReq) (*GetBundleBalanceLayoutResp, error)
-	SetBundleBalanceLayout(context.Context, *SetBundleBalanceLayoutReq) (*SetBundleBalanceLayoutResp, error)
 	// 使用记录
 	GetUsedRecordList(context.Context, *GetUsedRecordListReq) (*GetUsedRecordListResp, error)
 	GetImageWorkDetail(context.Context, *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error)
@@ -753,12 +735,6 @@ func (UnimplementedBundleServer) BundleActivate(context.Context, *BundleActivate
 func (UnimplementedBundleServer) BundleBalanceExport(context.Context, *BundleBalanceExportReq) (*BundleBalanceExportResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BundleBalanceExport not implemented")
 }
-func (UnimplementedBundleServer) GetBundleBalanceLayout(context.Context, *GetBundleBalanceLayoutReq) (*GetBundleBalanceLayoutResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetBundleBalanceLayout not implemented")
-}
-func (UnimplementedBundleServer) SetBundleBalanceLayout(context.Context, *SetBundleBalanceLayoutReq) (*SetBundleBalanceLayoutResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetBundleBalanceLayout not implemented")
-}
 func (UnimplementedBundleServer) GetUsedRecordList(context.Context, *GetUsedRecordListReq) (*GetUsedRecordListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUsedRecordList not implemented")
 }
@@ -2007,64 +1983,6 @@ func _Bundle_BundleBalanceExport_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Bundle_GetBundleBalanceLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetBundleBalanceLayoutReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("GetBundleBalanceLayout", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Bundle_SetBundleBalanceLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetBundleBalanceLayoutReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("SetBundleBalanceLayout", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Bundle_GetUsedRecordList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetUsedRecordListReq)
 	if err := dec(in); err != nil {
@@ -2812,14 +2730,6 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "BundleBalanceExport",
 			Handler:    _Bundle_BundleBalanceExport_Handler,
 		},
-		{
-			MethodName: "GetBundleBalanceLayout",
-			Handler:    _Bundle_GetBundleBalanceLayout_Handler,
-		},
-		{
-			MethodName: "SetBundleBalanceLayout",
-			Handler:    _Bundle_SetBundleBalanceLayout_Handler,
-		},
 		{
 			MethodName: "GetUsedRecordList",
 			Handler:    _Bundle_GetUsedRecordList_Handler,

pkg/db/mysql.go

@@ -61,7 +61,6 @@ func loadMysqlConn(conn string) *gorm.DB {
 		&model.BundleBalance{},
 		&model.Reconciliation{},
 		&model.BundleActivate{},
-		&model.BundleBalanceLayout{},
 	)
 
 	if err != nil {