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

Updata：解决冲突

Browse Source
This commit is contained in:
jiaji.H 2025-12-17 16:24:53 +08:00
commit c2b4114bd5
4 changed files with 1716 additions and 1679 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3385
api/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

2
api/bundle/bundle.validator.pb.go
View File

@ -7,8 +7,8 @@ import (
fmt "fmt" fmt "fmt"
math "math" math "math"
proto "github.com/golang/protobuf/proto" proto "github.com/golang/protobuf/proto"
_ "google.golang.org/protobuf/types/descriptorpb"
_ "github.com/mwitkow/go-proto-validators" _ "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 "github.com/mwitkow/go-proto-validators"
) )

4
pkg/cron/task.go
View File

@ -149,7 +149,7 @@ func AutoManuallyConfirmWorkTask() {
switch workCategory { switch workCategory {
case 1: case 1:
{ {
if balanceInfoRes.ImageConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足 if balanceInfoRes.ImageExtendConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足
_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
WorkAction: cast.WorkActionENUM_CONFIRM, WorkAction: cast.WorkActionENUM_CONFIRM,
WorkUuid: req.WorkUuid, WorkUuid: req.WorkUuid,
@ -163,7 +163,7 @@ func AutoManuallyConfirmWorkTask() {
} }
case 2: case 2:
{ {
if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足 if balanceInfoRes.VideoExtendConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足
_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{ _, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
WorkAction: cast.WorkActionENUM_CONFIRM, WorkAction: cast.WorkActionENUM_CONFIRM,
WorkUuid: req.WorkUuid, WorkUuid: req.WorkUuid,

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.ImageExtendNumber { // 图文余量不足 if balanceInfoRes.ImageExtendConsumptionNumber >= 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.VideoExtendNumber { // 视频余量不足 if balanceInfoRes.VideoExtendConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足
service.Error(c, errors.New("视频余量不足")) service.Error(c, errors.New("视频余量不足"))
return return
} }