pkg/service/cast/work.go

@@ -257,17 +257,17 @@ func CheckUserBundleBalance(userID int32, balanceType modelCast.BalanceTypeEnum)
 			return
 		}
 	case modelCast.BalanceTypeImageValue:
-		if resp.ImageExtendConsumptionNumber-resp.ImageExtendNumber <= 0 {
+		if resp.ImageNumber-resp.ImageConsumptionNumber <= 0 {
 			err = errors.New(e.ErrorBalanceInsufficient)
 			return
 		}
 	case modelCast.BalanceTypeVideoValue:
-		if resp.VideoExtendConsumptionNumber-resp.VideoExtendNumber <= 0 {
+		if resp.VideoNumber-resp.VideoConsumptionNumber <= 0 {
 			err = errors.New(e.ErrorBalanceInsufficient)
 			return
 		}
 	case modelCast.BalanceTypeDataValue:
-		if resp.DataAnalysisExtendConsumptionNumber-resp.DataAnalysisExtendNumber <= 0 {
+		if resp.DataAnalysisNumber-resp.DataAnalysisConsumptionNumber <= 0 {
 			err = errors.New(e.ErrorBalanceInsufficient)
 			return
 		}
@@ -811,32 +811,55 @@ func autoConfirm(ctx context.Context, workUuid string) (err error) {
 		return
 	}
 	userID, _ := strconv.ParseInt(infoResp.ArtistUuid, 10, 64)
+	balanceInfoRes, err := service.BundleProvider.GetBundleBalanceByUserId(context.Background(), &bundle.GetBundleBalanceByUserIdReq{
+		UserId: int32(userID),
+	})
+	if err != nil {
+		zap.L().Error("autoConfirm GetBundleBalanceByUserId", zap.Any("err", err))
+		//return
+		confirmRemark = "获取余额失败:" + err.Error()
+		isFailed = true
+	}
+
 	var workCategory = infoResp.WorkCategory
-	var checkType modelCast.BalanceTypeEnum
+	var addBalanceReq bundle.AddBundleBalanceReq
+	addBalanceReq.UserId = int32(userID)
 	switch workCategory {
 	case 1:
-		checkType = modelCast.BalanceTypeImageValue
-	case 2:
-		checkType = modelCast.BalanceTypeVideoValue
-	}
-	var resp *bundle.AddBundleBalanceResp = nil
-	err = CheckUserBundleBalance(int32(userID), checkType)
-	if err != nil {
-		isFailed = true
-		confirmRemark = err.Error()
-	} else {
-		var addBalanceReq bundle.AddBundleBalanceReq
-		addBalanceReq.UserId = int32(userID)
-		zap.L().Info("autoConfirm AddBundleBalanceReq", zap.Any("addBalanceReq", &addBalanceReq))
-		resp, err = service.BundleProvider.AddBundleBalance(context.Background(), &addBalanceReq)
-		if err != nil {
-			zap.L().Error("autoConfirm AddBundleBalance", zap.Any("err", err))
-			confirmRemark = "扣除失败:" + err.Error()
-			isFailed = true
-			//return
+		{
+			if balanceInfoRes.ImageConsumptionNumber >= balanceInfoRes.ImageNumber { // 图文余量不足
+				//err = errors.New("图文余量不足")
+				//return
+				confirmRemark = "图文余量不足"
+				isFailed = true
+			}
+			addBalanceReq.ImageConsumptionNumber = 1
 		}
-		zap.L().Info("autoConfirm AddBundleBalanceResp", zap.Any("resp", resp))
+	case 2:
+		{
+			if balanceInfoRes.VideoConsumptionNumber >= balanceInfoRes.VideoNumber { // 视频余量不足
+				//err = errors.New("视频余量不足")
+				//return
+				confirmRemark = "视频余量不足"
+				isFailed = true
+			}
+			addBalanceReq.VideoConsumptionNumber = 1
+		}
+	default:
+		//err = errors.New("不支持的类型")
+		//return
+		confirmRemark = "不支持的类型"
+		isFailed = true
 	}
+	zap.L().Info("autoConfirm AddBundleBalanceReq", zap.Any("addBalanceReq", &addBalanceReq))
+	resp, err := service.BundleProvider.AddBundleBalance(context.Background(), &addBalanceReq)
+	if err != nil {
+		zap.L().Error("autoConfirm AddBundleBalance", zap.Any("err", err))
+		confirmRemark = "扣除失败:" + err.Error()
+		isFailed = true
+		//return
+	}
+	zap.L().Info("autoConfirm AddBundleBalanceResp", zap.Any("resp", resp))
 	var confirmStatus uint32 = 1
 	if isFailed {
 		usedType = 0