diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index d3be71c..e571640 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -272,18 +272,22 @@ func GetVedioWorkDetail(req *bundle.GetVedioWorkDetailReq) (data model.CastWorkV } func ToBeComfirmedWorks(req *bundle.ToBeComfirmedWorksReq) (data []model.CastWorkLog, total int64, unconfirmed int64, err error) { - subQuery := app.ModuleClients.BundleDB. + unConfirmSubQuery := app.ModuleClients.BundleDB. Table("cast_work_log"). Select("work_uuid, MAX(update_time) AS max_update_time"). - Group("work_uuid").Where("work_status in ?", []int{4, 5, 6, 7}) + Group("work_uuid").Where("work_status = ?", 4) 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). + Joins("INNER JOIN (?) AS t ON cwl.work_uuid = t.work_uuid AND cwl.update_time = t.max_update_time", unConfirmSubQuery). Where("artist_uuid = ?", req.ArtistUuid).Where("confirmed_at = ?", 0).Count(&unconfirmed).Error if err != nil { return } + subQuery := app.ModuleClients.BundleDB. + Table("cast_work_log"). + Select("work_uuid, MAX(update_time) AS max_update_time"). + Group("work_uuid").Where("work_status in ?", []int{4, 5, 6, 7}) 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). diff --git a/internal/logic/orderRecordsLogic.go b/internal/logic/orderRecordsLogic.go index da3fa86..92c1f3f 100644 --- a/internal/logic/orderRecordsLogic.go +++ b/internal/logic/orderRecordsLogic.go @@ -156,7 +156,6 @@ func UpdateReconciliationStatusBySerialNumber(req *bundle.UpdateStatusAndPayTime res, err = dao.UpdateReconciliationStatusBySerialNumber(req) return } - func DeleteValueAddService(req *bundle.DeleteValueAddServiceRequest) (res *bundle.CommonResponse, err error) { res = new(bundle.CommonResponse) res, err = dao.DeleteValueAddService(req)