Updata:作品确认时增加判断套餐是否过期

pkg/cron/task.go

@@ -11,6 +11,7 @@ import (
 	bundleModel "fonchain-fiee/pkg/model/bundle"
 	modelCast "fonchain-fiee/pkg/model/cast"
 	"fonchain-fiee/pkg/service"
+	"fonchain-fiee/pkg/service/bundle/common"
 	serverCast "fonchain-fiee/pkg/service/cast"
 	"log"
 	"math/rand"
@@ -138,6 +139,17 @@ func AutoManuallyConfirmWorkTask() {
 			continue
 		}
 
+		if balanceInfoRes.BundleStatus == common.BundleExpired {
+			_, 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
+		}
+
 		wordInfoRes, err := service.CastProvider.WorkDetail(context.Background(), &cast.WorkDetailReq{
 			WorkUuid: req.WorkUuid,
 		})

pkg/service/bundle/bundleBalance.go

@@ -197,6 +197,18 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 		service.Error(c, errors.New(common.GetWorkDetailFailed))
 		return
 	}
+
+	if balanceInfoRes.BundleStatus == common.BundleExpired {
+		_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+			WorkAction:    cast.WorkActionENUM_CONFIRM,
+			WorkUuid:      req.WorkUuid,
+			ConfirmRemark: req.ConfirmRemark,
+			ConfirmStatus: 3,
+		})
+		service.Error(c, errors.New("套餐已过期"))
+		return
+	}
+
 	if wordInfoRes.WorkStatus != 4 {
 		service.Error(c, errors.New("作品不是待确认状态"))
 		return
@@ -209,6 +221,12 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 	case 1:
 		{
 			if balanceInfoRes.ImageExtendConsumptionNumber >= balanceInfoRes.ImageExtendNumber { // 图文余量不足
+				_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+					WorkAction:    cast.WorkActionENUM_CONFIRM,
+					WorkUuid:      req.WorkUuid,
+					ConfirmRemark: req.ConfirmRemark,
+					ConfirmStatus: 3,
+				})
 				service.Error(c, errors.New("图文余量不足"))
 				return
 			}
@@ -217,6 +235,12 @@ func WorkConfirm(c *gin.Context) { // 确认作品并扣除余量
 	case 2:
 		{
 			if balanceInfoRes.VideoExtendConsumptionNumber >= balanceInfoRes.VideoExtendNumber { // 视频余量不足
+				_, err = service.CastProvider.UpdateStatus(context.Background(), &cast.UpdateStatusReq{
+					WorkAction:    cast.WorkActionENUM_CONFIRM,
+					WorkUuid:      req.WorkUuid,
+					ConfirmRemark: req.ConfirmRemark,
+					ConfirmStatus: 3,
+				})
 				service.Error(c, errors.New("视频余量不足"))
 				return
 			}

pkg/service/bundle/common/msg.go

@@ -105,6 +105,8 @@ const (
 	GetWorkDetailFailed    = "获取作品详情失败"
 )
 
+//用户套餐状态
+
 // 余量
 const (
 	BundleExtendFailed            = "套餐扩展失败"
@@ -122,9 +124,10 @@ const (
 	InsufficientBalance           = "余量不足"
 )
 
+//用户套餐状态
 const (
-	BundleExpired    = 1
-	BundleNotExpired = 0
+	BundleExpired    = 1 //已过期
+	BundleNotExpired = 0 //未过期
 )
 
 // 数据指标