diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 5bc080f..c654789 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -10,6 +10,7 @@ import ( "strconv" "time" + "dubbo.apache.org/dubbo-go/v3/common/logger" "github.com/duke-git/lancet/v2/datetime" "gorm.io/gorm" @@ -32,6 +33,7 @@ func AddBundleExtendRecord(data model.BundleExtensionRecords) error { expireTime = et } else { expireTime = time.Now() + logger.Infof("过期时间为空,使用默认过期时间" + expireTime.Format(time.DateTime)) } switch data.TimeUnit { @@ -272,19 +274,19 @@ func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (data []model.CastWor subQuery := app.ModuleClients.BundleDB. Table("cast_work_log"). Select("work_uuid, MAX(update_time) AS max_update_time"). - Group("work_uuid") + Group("work_uuid").Where("work_status in ?", []int{4, 5, 6, 7}) err = app.ModuleClients.BundleDB. Table("cast_work_log AS cwl"). Joins("INNER JOIN (?) AS t ON cwl.work_uuid = t.work_uuid AND cwl.update_time = t.max_update_time", subQuery). - Where("artist_uuid = ?", req.ArtistUuid).Where("confirmed_at = ?", 0).Where("work_status in ?", []int{4, 5, 6, 7}).Count(&unconfirmed).Error + Where("artist_uuid = ?", req.ArtistUuid).Where("confirmed_at = ?", 0).Count(&unconfirmed).Error if err != nil { return } session := app.ModuleClients.BundleDB. Table("cast_work_log AS cwl"). Joins("INNER JOIN (?) AS t ON cwl.work_uuid = t.work_uuid AND cwl.update_time = t.max_update_time", subQuery). - Where("artist_uuid = ?", req.ArtistUuid).Where("work_status in ?", []int{4, 5, 6, 7}) + Where("artist_uuid = ?", req.ArtistUuid) err = session.Count(&total).Error if err != nil { return