Updata：解决冲突

api/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
 }

api/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,

pkg/cron/task.go

@@ -5,12 +5,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"fonchain-fiee/api/bundle"
 	"fonchain-fiee/api/cast"
 	"fonchain-fiee/pkg/cache"
+	bundleModel "fonchain-fiee/pkg/model/bundle"
 	modelCast "fonchain-fiee/pkg/model/cast"
 	"fonchain-fiee/pkg/service"
 	serverCast "fonchain-fiee/pkg/service/cast"
 	"log"
+	"math/rand"
+	"strconv"
 	"time"
 
 	"github.com/go-redis/redis"
@@ -31,6 +35,9 @@ func InitTasks() error {
 	// 启动队列消费者
 	go WorkPublishQueueConsumer()
 
+	// 启动随机间隔的自动确认任务
+	go AutoManuallyConfirmWorkTaskWithRandomInterval()
+
 	return nil
 }
 
@@ -50,6 +57,127 @@ func RefreshWorkApprovalStatusTask() {
 	serverCast.RefreshWorkApproval(nil, resp.Data)
 }
 
+// AutoManuallyConfirmWorkTaskWithRandomInterval 以随机间隔（3-7分钟）执行自动确认任务
+func AutoManuallyConfirmWorkTaskWithRandomInterval() {
+
+	for {
+		// 执行任务
+		AutoManuallyConfirmWorkTask()
+
+		// 生成3-7分钟之间的随机间隔（单位：分钟）
+		randomMinutes := rand.Intn(5) + 3 // 3-7分钟
+		randomDuration := time.Duration(randomMinutes) * time.Minute
+
+		// 等待随机时间
+		time.Sleep(randomDuration)
+	}
+}
+func AutoManuallyConfirmWorkTask() {
+	var req bundle.GetWaitConfirmWorkListReq
+	res, err := service.BundleProvider.GetWaitConfirmWorkList(context.Background(), &req)
+	if err != nil {
+		zap.L().Error("获取待确认作品列表失败", zap.Error(err))
+		return
+	}
+	if res.Data == nil || len(res.Data) == 0 {
+		return
+	}
+	for _, work := range res.Data {
+		var req bundleModel.UserWorkConfirmReq
+		req.WorkUuid = work.WorkUuid
+		req.ConfirmStatus = 1
+		artistId, err := strconv.ParseInt(work.ArtistUuid, 10, 64)
+		if err != nil {
+			zap.L().Error("解析艺术家ID失败", zap.Error(err))
+			return
+		}
+		if req.ConfirmStatus == 2 { // 驳回完直接结束
+			_, err := service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+				WorkAction:    cast.WorkActionENUM_CONFIRM,
+				WorkUuid:      req.WorkUuid,
+				ConfirmRemark: req.ConfirmRemark,
+				ConfirmStatus: 2,
+			})
+			if err != nil {
+				zap.L().Error("确认作品失败", zap.Error(err))
+				return
+			}
+			continue
+		}
+
+		balanceInfoRes, err := service.BundleProvider.GetBundleBalanceByUserId(context.Background(), &bundle.GetBundleBalanceByUserIdReq{
+			UserId: int32(artistId),
+		})
+		if err != nil {
+			continue
+		}
+
+		wordInfoRes, err := service.CastProvider.WorkDetail(context.Background(), &cast.WorkDetailReq{
+			WorkUuid: req.WorkUuid,
+		})
+		if err != nil {
+			continue
+		}
+		if wordInfoRes.WorkStatus != 4 {
+			continue
+		}
+		var workCategory = wordInfoRes.WorkCategory
+
+		var addBalanceReq bundle.AddBundleBalanceReq
+		addBalanceReq.UserId = int32(artistId)
+		log.Printf("开始确认作品uuid:" + req.WorkUuid)
+		switch workCategory {
+		case 1:
+			{
+				if balanceInfoRes.ImageConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足
+					_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+						WorkAction:    cast.WorkActionENUM_CONFIRM,
+						WorkUuid:      req.WorkUuid,
+						ConfirmRemark: req.ConfirmRemark,
+						ConfirmStatus: 3,
+					})
+					log.Printf("图文余量不足,作品uuid:"+req.WorkUuid, zap.Error(err))
+					continue
+				}
+				addBalanceReq.ImageConsumptionNumber = 1
+			}
+		case 2:
+			{
+				if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足
+					_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+						WorkAction:    cast.WorkActionENUM_CONFIRM,
+						WorkUuid:      req.WorkUuid,
+						ConfirmRemark: req.ConfirmRemark,
+						ConfirmStatus: 3,
+					})
+					log.Printf("视频余量不足,作品uuid:"+req.WorkUuid, zap.Error(err))
+					continue
+				}
+				addBalanceReq.VideoConsumptionNumber = 1
+			}
+		default:
+			continue
+		}
+		resp, err := service.BundleProvider.AddBundleBalance(context.Background(), &addBalanceReq)
+		if err != nil {
+			log.Printf("扣除余额失败,作品uuid:"+req.WorkUuid, zap.Error(err))
+			continue
+		}
+		log.Printf("扣除余额成功,作品uuid:" + req.WorkUuid)
+		_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+			WorkAction:    cast.WorkActionENUM_CONFIRM,
+			WorkUuid:      req.WorkUuid,
+			ConfirmRemark: req.ConfirmRemark,
+			CostType:      resp.UsedType,
+			ConfirmStatus: 1,
+		})
+		if err != nil {
+			log.Printf("更新作品状态失败,作品uuid:"+req.WorkUuid, zap.Error(err))
+			return
+		}
+	}
+}
+
 func ArtistAutoConfirmTask() {
 	now := float64(time.Now().Unix())
 	opt := redis.ZRangeBy{

pkg/service/bundle/bundleBalance.go

@@ -208,7 +208,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 	switch workCategory {
 	case 1:
 		{
-			if balanceInfoRes.ImageConsumptionNumber >= balanceInfoRes.ImageNumber { // 图文余量不足
+			if balanceInfoRes.ImageConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足
 				service.Error(c, errors.New("图文余量不足"))
 				return
 			}
@@ -216,7 +216,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 		}
 	case 2:
 		{
-			if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoNumber { // 视频余量不足
+			if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足
 				service.Error(c, errors.New("视频余量不足"))
 				return
 			}