添加套餐激活状态

internal/controller/bundleExtend.go

@@ -49,3 +49,7 @@ func (b *BundleProvider) ToBeComfirmedWorks(_ context.Context, req *bundle.ToBeC
 func (b *BundleProvider) ConfirmWork(_ context.Context, req *bundle.ConfirmWorkReq) (*bundle.ConfirmWorkResp, error) {
 	return logic.ConfirmWork(req)
 }
+
+func (b *BundleProvider) BundleActivate(_ context.Context, req *bundle.BundleActivateReq) (*bundle.BundleActivateResp, error) {
+	return nil, logic.BundleActivate(req)
+}

internal/dao/bundleExtend.go

@@ -307,3 +307,11 @@ func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (data []model.CastWor
 func ConfirmWork(req *bundle.ConfirmWorkReq) error {
 	return app.ModuleClients.BundleDB.Model(&model.CastWorkLog{}).Where(&model.CastWorkLog{WorkUuid: req.WorkUuid}).Update("confirmed_at", time.Now().Unix()).Error
 }
+
+func BundleActivate(ids []uint32) error {
+	batch := []model.BundleActivate{}
+	for _, v := range ids {
+		batch = append(batch, model.BundleActivate{UserId: int(v), Activate: true})
+	}
+	return app.ModuleClients.BundleDB.Model(&model.BundleActivate{}).Where("user_id = ?").Save(batch).Error
+}

internal/logic/bundleExtendLogic.go

@@ -174,3 +174,7 @@ func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (*bundle.ToBeComfirme
 func ConfirmWork(req *bundle.ConfirmWorkReq) (*bundle.ConfirmWorkResp, error) {
 	return nil, dao.ConfirmWork(req)
 }
+
+func BundleActivate(req *bundle.BundleActivateReq) error {
+	return dao.BundleActivate(req.Ids)
+}

internal/model/bundle.go

@@ -204,3 +204,14 @@ type BundleBalance struct {
 func (*BundleBalance) TableName() string {
 	return "bundle_balance"
 }
+
+type BundleActivate struct {
+	gorm.Model
+	UserId   int  `gorm:"column:user_id;not null;unique"`
+	Activate bool `gorm:"column:activate"`
+}
+
+// TableName 表名称
+func (*BundleActivate) TableName() string {
+	return "bundle_activate"
+}

pb/bundle.proto

@@ -60,6 +60,7 @@ service Bundle {
   rpc GetBundleBalanceByUserId(GetBundleBalanceByUserIdReq) returns (GetBundleBalanceByUserIdResp) {} // 余量信息
   rpc CreateBundleBalance(CreateBundleBalanceReq) returns (CreateBundleBalanceResp) {} // 创建新的余量信息
   rpc AddBundleBalance(AddBundleBalanceReq) returns (AddBundleBalanceResp) {} // 修改余量信息
+  rpc BundleActivate(BundleActivateReq) returns (BundleActivateResp) {} // 用户套餐激活
 
   // 使用记录
   rpc GetUsedRecordList(GetUsedRecordListReq) returns (GetUsedRecordListResp) {} // 获取套餐使用记录列表
@@ -876,3 +877,12 @@ message UnfinishedInfo {
 message SoftDeleteUnfinishedInfoRequest {
   uint32 ID = 1;
 }
+
+
+message BundleActivateReq{
+  repeated uint32 ids = 1; // 激活用户的id
+}
+
+message BundleActivateResp{
+
+}

pb/bundle/bundle.validator.pb.go

@@ -466,3 +466,9 @@ func (this *UnfinishedInfo) Validate() error {
 func (this *SoftDeleteUnfinishedInfoRequest) Validate() error {
 	return nil
 }
+func (this *BundleActivateReq) Validate() error {
+	return nil
+}
+func (this *BundleActivateResp) Validate() error {
+	return nil
+}

pb/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-triple v1.0.5
+// - protoc-gen-go-triple v1.0.8
-// - protoc             v6.32.0
+// - protoc             v3.12.4
 // source: pb/bundle.proto
 
 package bundle
@@ -69,6 +69,7 @@ type BundleClient interface {
 	GetBundleBalanceByUserId(ctx context.Context, in *GetBundleBalanceByUserIdReq, opts ...grpc_go.CallOption) (*GetBundleBalanceByUserIdResp, common.ErrorWithAttachment)
 	CreateBundleBalance(ctx context.Context, in *CreateBundleBalanceReq, opts ...grpc_go.CallOption) (*CreateBundleBalanceResp, common.ErrorWithAttachment)
 	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)
 	// 使用记录
 	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)
@@ -128,6 +129,7 @@ type BundleClientImpl struct {
 	GetBundleBalanceByUserId                 func(ctx context.Context, in *GetBundleBalanceByUserIdReq) (*GetBundleBalanceByUserIdResp, error)
 	CreateBundleBalance                      func(ctx context.Context, in *CreateBundleBalanceReq) (*CreateBundleBalanceResp, error)
 	AddBundleBalance                         func(ctx context.Context, in *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
+	BundleActivate                           func(ctx context.Context, in *BundleActivateReq) (*BundleActivateResp, 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)
@@ -381,6 +383,12 @@ func (c *bundleClient) AddBundleBalance(ctx context.Context, in *AddBundleBalanc
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/AddBundleBalance", in, out)
 }
 
+func (c *bundleClient) BundleActivate(ctx context.Context, in *BundleActivateReq, opts ...grpc_go.CallOption) (*BundleActivateResp, common.ErrorWithAttachment) {
+	out := new(BundleActivateResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BundleActivate", 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)
@@ -492,6 +500,7 @@ type BundleServer interface {
 	GetBundleBalanceByUserId(context.Context, *GetBundleBalanceByUserIdReq) (*GetBundleBalanceByUserIdResp, error)
 	CreateBundleBalance(context.Context, *CreateBundleBalanceReq) (*CreateBundleBalanceResp, error)
 	AddBundleBalance(context.Context, *AddBundleBalanceReq) (*AddBundleBalanceResp, error)
+	BundleActivate(context.Context, *BundleActivateReq) (*BundleActivateResp, error)
 	// 使用记录
 	GetUsedRecordList(context.Context, *GetUsedRecordListReq) (*GetUsedRecordListResp, error)
 	GetImageWorkDetail(context.Context, *GetImageWorkDetailReq) (*GetImageWorkDetailResp, error)
@@ -628,6 +637,9 @@ func (UnimplementedBundleServer) CreateBundleBalance(context.Context, *CreateBun
 func (UnimplementedBundleServer) AddBundleBalance(context.Context, *AddBundleBalanceReq) (*AddBundleBalanceResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddBundleBalance not implemented")
 }
+func (UnimplementedBundleServer) BundleActivate(context.Context, *BundleActivateReq) (*BundleActivateResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BundleActivate not implemented")
+}
 func (UnimplementedBundleServer) GetUsedRecordList(context.Context, *GetUsedRecordListReq) (*GetUsedRecordListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUsedRecordList not implemented")
 }
@@ -1791,6 +1803,35 @@ func _Bundle_AddBundleBalance_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_BundleActivate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BundleActivateReq)
+	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("BundleActivate", 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 {
@@ -2269,6 +2310,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "AddBundleBalance",
 			Handler:    _Bundle_AddBundleBalance_Handler,
 		},
+		{
+			MethodName: "BundleActivate",
+			Handler:    _Bundle_BundleActivate_Handler,
+		},
 		{
 			MethodName: "GetUsedRecordList",
 			Handler:    _Bundle_GetUsedRecordList_Handler,

pkg/db/mysql.go

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