Updata:解决冲突

internal/controller/bundleExtend.go

@@ -61,6 +61,11 @@ func (b *BundleProvider) ConfirmWork(_ context.Context, req *bundle.ConfirmWorkR
 	return logic.ConfirmWork(req)
 }
 
+// 获取待确认作品列表
+func (b *BundleProvider) GetWaitConfirmWorkList(_ context.Context, req *bundle.GetWaitConfirmWorkListReq) (*bundle.GetWaitConfirmWorkListResp, error) {
+	return logic.GetWaitConfirmWorkList(req)
+}
+
 // 套餐激活
 func (b *BundleProvider) BundleActivate(_ context.Context, req *bundle.BundleActivateReq) (*bundle.BundleActivateResp, error) {
 	return nil, logic.BundleActivate(req)

internal/dao/bundleExtend.go

@@ -536,6 +536,21 @@ 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 GetWaitConfirmWorkList() (data []model.CastWork, err error) {
+	twentyFourHoursAgo := time.Now().Add(-24 * time.Hour).Format("2006-01-02 15:04:05")
+	err = app.ModuleClients.BundleDB.Model(&model.CastWork{}).
+		Where("deleted_at = 0").
+		Where("status = ?", 4).
+		Where("submit_time >= ?", twentyFourHoursAgo).
+		Order("submit_time desc").
+		Limit(5).
+		Find(&data).Error
+	if err != nil {
+		return
+	}
+	return
+}
+
 func BundleActivate(ids []uint32) error {
 	for _, v := range ids {
 		app.ModuleClients.BundleDB.Transaction(func(tx *gorm.DB) error {

internal/logic/bundleExtendLogic.go

@@ -202,15 +202,19 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.
 		PaymentAmount:                 data.PaymentAmount,
 		PaymentType:                   data.PaymentType,
 		AccountNumber:                 int32(data.BundleAccountNumber) + int32(data.IncreaseAccountNumber) + int32(data.ManualAccountNumber),
+		AccountExtendNumber:           int32(data.BundleAccountNumber) + int32(data.IncreaseAccountNumber) + int32(data.ManualAccountNumber),
 		AccountAdditional:             int32(data.ManualAccountNumber),
 		AccountConsumptionNumber:      int32(data.BundleAccountConsumptionNumber) + int32(data.IncreaseAccountConsumptionNumber) + int32(data.ManualAccountConsumptionNumber),
 		VideoNumber:                   int32(data.BundleVideoNumber) + int32(data.BundleLimitVideoNumber) + int32(data.BundleLimitVideoExpiredNumber) + int32(data.IncreaseVideoNumber) + int32(data.IncreaseLimitVideoNumber) + int32(data.IncreaseLimitVideoExpiredNumber) + int32(data.ManualVideoNumber),
+		VideoExtendNumber:             int32(data.MonthlyBundleLimitVideoNumber) + int32(data.MonthlyIncreaseLimitVideoNumber) + int32(data.MonthlyBundleLimitExpiredVideoNumber) + int32(data.MonthlyIncreaseLimitExpiredVideoNumber) + int32(data.ManualVideoNumber) + int32(data.IncreaseVideoNumber) + int32(data.BundleVideoNumber),
 		VideoAdditional:               int32(data.ManualVideoNumber),
 		VideoConsumptionNumber:        int32(data.BundleVideoConsumptionNumber) + int32(data.BundleLimitVideoConsumptionNumber) + int32(data.BundleLimitVideoExpiredConsumptionNumber) + int32(data.IncreaseVideoConsumptionNumber) + int32(data.IncreaseLimitVideoConsumptionNumber) + int32(data.IncreaseLimitVideoExpiredConsumptionNumber) + int32(data.ManualVideoConsumptionNumber),
 		ImageNumber:                   int32(data.BundleImageNumber) + int32(data.BundleLimitImageNumber) + int32(data.BundleLimitImageExpiredNumber) + int32(data.IncreaseImageNumber) + int32(data.IncreaseLimitImageNumber) + int32(data.IncreaseLimitImageExpiredNumber) + int32(data.ManualImageNumber),
+		ImageExtendNumber:             int32(data.MonthlyBundleLimitImageNumber) + int32(data.MonthlyIncreaseLimitImageNumber) + int32(data.MonthlyBundleLimitExpiredImageNumber) + int32(data.MonthlyIncreaseLimitExpiredImageNumber) + int32(data.ManualImageNumber) + int32(data.IncreaseImageNumber) + int32(data.BundleImageNumber),
 		ImageAdditional:               int32(data.ManualImageNumber),
 		ImageConsumptionNumber:        int32(data.BundleImageConsumptionNumber) + int32(data.BundleLimitImageConsumptionNumber) + int32(data.BundleLimitImageExpiredConsumptionNumber) + int32(data.IncreaseImageConsumptionNumber) + int32(data.IncreaseLimitImageConsumptionNumber) + int32(data.IncreaseLimitImageExpiredConsumptionNumber) + int32(data.ManualImageConsumptionNumber),
 		DataAnalysisNumber:            int32(data.BundleDataAnalysisNumber) + int32(data.BundleLimitDataAnalysisNumber) + int32(data.BundleLimitDataAnalysisExpiredNumber) + int32(data.IncreaseDataAnalysisNumber) + int32(data.IncreaseLimitDataAnalysisNumber) + int32(data.IncreaseLimitDataAnalysisExpiredNumber) + int32(data.ManualDataAnalysisNumber),
+		DataAnalysisExtendNumber:      int32(data.MonthlyBundleLimitDataAnalysisNumber) + int32(data.MonthlyIncreaseLimitDataAnalysisNumber) + int32(data.MonthlyBundleLimitExpiredDataAnalysisNumber) + int32(data.MonthlyIncreaseLimitExpiredDataAnalysisNumber) + int32(data.ManualDataAnalysisNumber) + int32(data.IncreaseDataAnalysisNumber) + int32(data.BundleDataAnalysisNumber),
 		DataAnalysisAdditional:        int32(data.ManualDataAnalysisNumber),
 		DataAnalysisConsumptionNumber: int32(data.BundleDataAnalysisConsumptionNumber) + int32(data.BundleLimitDataAnalysisConsumptionNumber) + int32(data.BundleLimitDataAnalysisExpiredConsumptionNumber) + int32(data.IncreaseDataAnalysisConsumptionNumber) + int32(data.IncreaseLimitDataAnalysisConsumptionNumber) + int32(data.IncreaseLimitDataAnalysisExpiredConsumptionNumber) + int32(data.ManualDataAnalysisConsumptionNumber),
 	}
@@ -447,6 +451,24 @@ func ConfirmWork(req *bundle.ConfirmWorkReq) (*bundle.ConfirmWorkResp, error) {
 	return nil, dao.ConfirmWork(req)
 }
 
+func GetWaitConfirmWorkList(req *bundle.GetWaitConfirmWorkListReq) (*bundle.GetWaitConfirmWorkListResp, error) {
+	data, err := dao.GetWaitConfirmWorkList()
+	if err != nil {
+		logger.Error(err)
+		return nil, errors.New("查询失败")
+	}
+	result := &bundle.GetWaitConfirmWorkListResp{}
+	result.Data = lo.Map(data, func(m model.CastWork, _ int) *bundle.ConfirmWorkItem {
+		return &bundle.ConfirmWorkItem{
+			WorkUuid:     m.Uuid,
+			WorkCategory: int32(m.WorkCategory),
+			ArtistName:   m.ArtistName,
+			ArtistUuid:   m.ArtistUuid,
+		}
+	})
+	return result, nil
+}
+
 func BundleActivate(req *bundle.BundleActivateReq) error {
 	return dao.BundleActivate(req.Ids)
 }

pb/bundle.proto

@@ -72,6 +72,7 @@ service Bundle {
 
   rpc ToBeComfirmedWorks(ToBeComfirmedWorksReq) returns (ToBeComfirmedWorksResp) {} // 待确认作品列表
   rpc ConfirmWork(ConfirmWorkReq) returns (ConfirmWorkResp) {} // 确认作品
+  rpc GetWaitConfirmWorkList(GetWaitConfirmWorkListReq) returns (GetWaitConfirmWorkListResp) {} // 获取待确认作品列表
 
   //对账单
   rpc GetReconciliationList(GetReconciliationListReq) returns (GetReconciliationListResp) {} // 获取对账单列表
@@ -1035,6 +1036,8 @@ message ToBeComfirmedWorksResp{
   repeated workItem data = 3;
 }
 
+
+
 message GetBundleBalanceByUserIdReq{
   int32 userId = 1;
 }
@@ -1048,19 +1051,23 @@ message GetBundleBalanceByUserIdResp{
   int64 expiredTime = 6;
   string paymentAmount = 7;
   int32 paymentType = 8;
-  int32 accountNumber = 9;      
+  int32 accountNumber = 9;
-  int32 accountAdditional = 10;      
+  int32 accountExtendNumber = 10;      
-  int32 accountConsumptionNumber = 11;  
+  int32 accountAdditional = 11;      
-  int32 videoNumber = 12;                  
+  int32 accountConsumptionNumber = 12;  
-  int32 videoAdditional = 13;                 
+  int32 videoNumber = 13;
-  int32 videoConsumptionNumber = 14;       
+  int32 videoExtendNumber = 14;                   
-  int32 imageNumber = 15;                  
+  int32 videoAdditional = 15;                 
-  int32 imageAdditional = 16;                 
+  int32 videoConsumptionNumber = 16;       
-  int32 imageConsumptionNumber = 17; 
+  int32 imageNumber = 17;      
-  int32 dataAnalysisNumber = 18;
+  int32 imageExtendNumber = 18;             
-  int32 dataAnalysisAdditional = 19;
+  int32 imageAdditional = 19;                 
-  int32 dataAnalysisConsumptionNumber = 20;
+  int32 imageConsumptionNumber = 20; 
-  int32 expansionPacksNumber = 21;  
+  int32 dataAnalysisNumber = 21;
+  int32 dataAnalysisExtendNumber = 22;
+  int32 dataAnalysisAdditional = 23;
+  int32 dataAnalysisConsumptionNumber = 24;
+  int32 expansionPacksNumber = 25;  
 }
 
 message OnlyAddValueListByOrderNoRequest{
@@ -1093,6 +1100,20 @@ message ConfirmWorkResp{
 
 }
 
+message ConfirmWorkItem{
+  string workUuid = 1;
+  string artistName = 2;
+  string artistUuid = 3;
+  int32 workCategory = 4;
+}
+
+message GetWaitConfirmWorkListReq{}
+
+message GetWaitConfirmWorkListResp{ 
+  repeated ConfirmWorkItem data = 1;
+}
+
+
 message AutoCreateUserAndOrderRequest {
   int32 num = 1; // 处理数量
 }

pb/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/mwitkow/go-proto-validators"
 	_ "google.golang.org/protobuf/types/descriptorpb"
+	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 
@@ -483,6 +483,22 @@ func (this *ConfirmWorkReq) Validate() error {
 func (this *ConfirmWorkResp) Validate() error {
 	return nil
 }
+func (this *ConfirmWorkItem) Validate() error {
+	return nil
+}
+func (this *GetWaitConfirmWorkListReq) Validate() error {
+	return nil
+}
+func (this *GetWaitConfirmWorkListResp) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
 func (this *AutoCreateUserAndOrderRequest) Validate() error {
 	return nil
 }

pb/bundle/bundle_triple.pb.go

@@ -79,6 +79,7 @@ type BundleClient interface {
 	GetVedioWorkDetail(ctx context.Context, in *GetVedioWorkDetailReq, opts ...grpc_go.CallOption) (*GetVedioeWorkDetailResp, common.ErrorWithAttachment)
 	ToBeComfirmedWorks(ctx context.Context, in *ToBeComfirmedWorksReq, opts ...grpc_go.CallOption) (*ToBeComfirmedWorksResp, common.ErrorWithAttachment)
 	ConfirmWork(ctx context.Context, in *ConfirmWorkReq, opts ...grpc_go.CallOption) (*ConfirmWorkResp, common.ErrorWithAttachment)
+	GetWaitConfirmWorkList(ctx context.Context, in *GetWaitConfirmWorkListReq, opts ...grpc_go.CallOption) (*GetWaitConfirmWorkListResp, common.ErrorWithAttachment)
 	// 对账单
 	GetReconciliationList(ctx context.Context, in *GetReconciliationListReq, opts ...grpc_go.CallOption) (*GetReconciliationListResp, common.ErrorWithAttachment)
 	CreateReconciliation(ctx context.Context, in *ReconciliationInfo, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
@@ -169,6 +170,7 @@ type BundleClientImpl struct {
 	GetVedioWorkDetail                       func(ctx context.Context, in *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error)
 	ToBeComfirmedWorks                       func(ctx context.Context, in *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error)
 	ConfirmWork                              func(ctx context.Context, in *ConfirmWorkReq) (*ConfirmWorkResp, error)
+	GetWaitConfirmWorkList                   func(ctx context.Context, in *GetWaitConfirmWorkListReq) (*GetWaitConfirmWorkListResp, error)
 	GetReconciliationList                    func(ctx context.Context, in *GetReconciliationListReq) (*GetReconciliationListResp, error)
 	CreateReconciliation                     func(ctx context.Context, in *ReconciliationInfo) (*CommonResponse, error)
 	UpdateReconciliation                     func(ctx context.Context, in *ReconciliationInfo) (*CommonResponse, error)
@@ -497,6 +499,12 @@ func (c *bundleClient) ConfirmWork(ctx context.Context, in *ConfirmWorkReq, opts
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ConfirmWork", in, out)
 }
 
+func (c *bundleClient) GetWaitConfirmWorkList(ctx context.Context, in *GetWaitConfirmWorkListReq, opts ...grpc_go.CallOption) (*GetWaitConfirmWorkListResp, common.ErrorWithAttachment) {
+	out := new(GetWaitConfirmWorkListResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetWaitConfirmWorkList", in, out)
+}
+
 func (c *bundleClient) GetReconciliationList(ctx context.Context, in *GetReconciliationListReq, opts ...grpc_go.CallOption) (*GetReconciliationListResp, common.ErrorWithAttachment) {
 	out := new(GetReconciliationListResp)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -744,6 +752,7 @@ type BundleServer interface {
 	GetVedioWorkDetail(context.Context, *GetVedioWorkDetailReq) (*GetVedioeWorkDetailResp, error)
 	ToBeComfirmedWorks(context.Context, *ToBeComfirmedWorksReq) (*ToBeComfirmedWorksResp, error)
 	ConfirmWork(context.Context, *ConfirmWorkReq) (*ConfirmWorkResp, error)
+	GetWaitConfirmWorkList(context.Context, *GetWaitConfirmWorkListReq) (*GetWaitConfirmWorkListResp, error)
 	// 对账单
 	GetReconciliationList(context.Context, *GetReconciliationListReq) (*GetReconciliationListResp, error)
 	CreateReconciliation(context.Context, *ReconciliationInfo) (*CommonResponse, error)
@@ -929,6 +938,9 @@ func (UnimplementedBundleServer) ToBeComfirmedWorks(context.Context, *ToBeComfir
 func (UnimplementedBundleServer) ConfirmWork(context.Context, *ConfirmWorkReq) (*ConfirmWorkResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ConfirmWork not implemented")
 }
+func (UnimplementedBundleServer) GetWaitConfirmWorkList(context.Context, *GetWaitConfirmWorkListReq) (*GetWaitConfirmWorkListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetWaitConfirmWorkList not implemented")
+}
 func (UnimplementedBundleServer) GetReconciliationList(context.Context, *GetReconciliationListReq) (*GetReconciliationListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetReconciliationList not implemented")
 }
@@ -2416,6 +2428,35 @@ func _Bundle_ConfirmWork_Handler(srv interface{}, ctx context.Context, dec func(
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_GetWaitConfirmWorkList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetWaitConfirmWorkListReq)
+	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("GetWaitConfirmWorkList", 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_GetReconciliationList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetReconciliationListReq)
 	if err := dec(in); err != nil {
@@ -3539,6 +3580,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "ConfirmWork",
 			Handler:    _Bundle_ConfirmWork_Handler,
 		},
+		{
+			MethodName: "GetWaitConfirmWorkList",
+			Handler:    _Bundle_GetWaitConfirmWorkList_Handler,
+		},
 		{
 			MethodName: "GetReconciliationList",
 			Handler:    _Bundle_GetReconciliationList_Handler,