Compare commits

..

No commits in common. "4ef0cdd7c93d7b2dfc28ce60ec217e606d66b059" and "a88cc56f24a4e8f61092bbe2a65e7e5c60b77aff" have entirely different histories.

2 changed files with 3 additions and 8 deletions

View File

@ -693,15 +693,15 @@ func UpdatePendingCount(req *UpdatePendingCountRequest) error {
if req.PendingVideoCount > bundleVideo+increaseVideo+manualVideo {
tx.Rollback()
return commonErr.ReturnError(nil, "请输入正确的本次任务数字", "扣减视频数量超过当前余额")
return commonErr.ReturnError(nil, "可用视频数不足", "扣减视频数量超过当前余额")
}
if req.PendingPostCount > bundleImage+increaseImage+manualImage {
tx.Rollback()
return commonErr.ReturnError(nil, "请输入正确的本次任务数字", "扣减图文数量超过当前余额")
return commonErr.ReturnError(nil, "可用图文数不足", "扣减图文数量超过当前余额")
}
if req.PendingDataCount > bundleData+increaseData+manualData {
tx.Rollback()
return commonErr.ReturnError(nil, "请输入正确的本次任务数字", "扣减数据分析数量超过当前余额")
return commonErr.ReturnError(nil, "可用数据分析数不足", "扣减数据分析数量超过当前余额")
}
// 扣减视频:优先 会过期限制(套餐→增值) → 不过期限制(套餐→增值) → 非限制套餐 → 非限制增值 → 手动

View File

@ -201,11 +201,6 @@ func AssignTask(req *dao.TaskAssignRequest) error {
// UpdatePendingCount 修改待发数量
func UpdatePendingCount(req *dao.UpdatePendingCountRequest) error {
// 待发视频数、图文数、数据分析数不能都为0
if req.PendingVideoCount == 0 && req.PendingPostCount == 0 && req.PendingDataCount == 0 {
return commonErr.ReturnError(nil, "请输入正确的本次任务数字", "待发视频数、图文数、数据分析数不能都为0")
}
// 1. 验证艺人是否有有效套餐
validArtistIDs, err := GetValidArtistIDs()
if err != nil {