Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev

api/cast/cast_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v6.32.0--rc2
+// - protoc             v3.21.1
 // source: pb/fiee/cast.proto
 
 package cast

pkg/service/bundle/bundleBalance.go

@@ -209,7 +209,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
 			}
@@ -217,7 +217,7 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 		}
 	case 2:
 		{
-			if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoNumber { // 视频余量不足
+			if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足
 				service.Error(c, errors.New("视频余量不足"))
 				return
 			}

pkg/service/cast/analysis.go

@@ -578,7 +578,8 @@ func autoConfirmAnalysis(ctx context.Context, analysisUuid string) (err error) {
 	})
 	if err != nil {
 		zap.L().Error("autoConfirmAnalysis GetWorkAnalysis", zap.Any("err", err))
-		return
+		confirmRemark = "获取数据分析详情失败:" + err.Error()
+		isFailed = true
 	}
 
 	if infoResp.WorkAnalysisStatus != 4 { // 4是待确认状态，需要根据实际情况调整
@@ -631,6 +632,7 @@ func autoConfirmAnalysis(ctx context.Context, analysisUuid string) (err error) {
 		ConfirmRemark: confirmRemark,
 		CostType:      usedType,
 		ConfirmStatus: confirmStatus,
+		ConfirmType:   2,
 	})
 	if err != nil {
 		return