fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
戴育兵 2025-12-17 14:08:13 +08:00
commit ea4e66a2a3
5 changed files with 6291 additions and 3246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7133
api/cast/cast.pb.go
View File

File diff suppressed because it is too large Load Diff

290
api/cast/cast.pb.validate.go
View File

File diff suppressed because it is too large Load Diff

2
api/cast/cast_triple.pb.go
View File

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

4
pkg/service/bundle/bundleBalance.go
View File

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

4
pkg/service/cast/analysis.go
View File

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