Compare commits
No commits in common. "a2aea360246274c9e21990e85aa29737ec1102bf" and "75eeb458d897612af6c6db1f7f42f645fed521a5" have entirely different histories.
a2aea36024
...
75eeb458d8
@ -490,9 +490,7 @@ func getBundleBalanceInfo(month string, bundleUUID string) (data BalanceInfo) {
|
||||
bb.monthly_bundle_limit_expired_video_number +
|
||||
bb.invalid_bundle_video_number +
|
||||
bb.bundle_limit_video_consumption_number +
|
||||
bb.bundle_limit_video_expired_consumption_number -
|
||||
bb.monthly_bundle_limit_expired_video_consumption_number -
|
||||
bb.monthly_bundle_limit_video_consumption_number
|
||||
bb.bundle_limit_video_expired_consumption_number
|
||||
) AS video,
|
||||
(
|
||||
bb.bundle_image_number +
|
||||
@ -500,9 +498,7 @@ func getBundleBalanceInfo(month string, bundleUUID string) (data BalanceInfo) {
|
||||
bb.monthly_bundle_limit_expired_image_number +
|
||||
bb.invalid_bundle_image_number +
|
||||
bb.bundle_limit_image_consumption_number +
|
||||
bb.bundle_limit_image_expired_consumption_number -
|
||||
bb.monthly_bundle_limit_expired_image_consumption_number -
|
||||
bb.monthly_bundle_limit_image_consumption_number
|
||||
bb.bundle_limit_image_expired_consumption_number
|
||||
) AS image,
|
||||
(
|
||||
bb.bundle_data_analysis_number +
|
||||
@ -510,9 +506,7 @@ func getBundleBalanceInfo(month string, bundleUUID string) (data BalanceInfo) {
|
||||
bb.monthly_bundle_limit_expired_data_analysis_number +
|
||||
bb.invalid_bundle_data_analysis_number +
|
||||
bb.bundle_limit_data_analysis_consumption_number +
|
||||
bb.bundle_limit_data_analysis_expired_consumption_number -
|
||||
bb.monthly_bundle_limit_expired_data_analysis_consumption_number -
|
||||
bb.monthly_bundle_limit_data_analysis_consumption_number
|
||||
bb.bundle_limit_data_analysis_expired_consumption_number
|
||||
) AS data_analysis
|
||||
`). // 不限制类型的总数 + 限制不过期类型的当月可用 + 限制过期类型的当月可用 + 限制不过期类型的总共已用 + 限制过期类型的总共已用 + 已过期的数量 = 总发放数
|
||||
Joins("LEFT JOIN bundle_order_records bor ON bor.uuid = bb.order_uuid").
|
||||
@ -546,9 +540,7 @@ func getIncreaseBalanceInfo(month string, bundleUUID string) (data BalanceInfo)
|
||||
bb.monthly_increase_limit_expired_video_number +
|
||||
bb.invalid_increase_video_number +
|
||||
bb.increase_limit_video_consumption_number +
|
||||
bb.increase_limit_video_expired_consumption_number -
|
||||
bb.monthly_increase_limit_expired_video_consumption_number -
|
||||
bb.monthly_increase_limit_video_consumption_number
|
||||
bb.increase_limit_video_expired_consumption_number
|
||||
) AS video,
|
||||
(
|
||||
bb.increase_image_number +
|
||||
@ -556,9 +548,7 @@ func getIncreaseBalanceInfo(month string, bundleUUID string) (data BalanceInfo)
|
||||
bb.monthly_increase_limit_expired_image_number +
|
||||
bb.invalid_increase_image_number +
|
||||
bb.increase_limit_image_consumption_number +
|
||||
bb.increase_limit_image_expired_consumption_number -
|
||||
bb.monthly_increase_limit_expired_image_consumption_number -
|
||||
bb.monthly_increase_limit_image_consumption_number
|
||||
bb.increase_limit_image_expired_consumption_number
|
||||
) AS image,
|
||||
(
|
||||
bb.increase_data_analysis_number +
|
||||
@ -566,9 +556,7 @@ func getIncreaseBalanceInfo(month string, bundleUUID string) (data BalanceInfo)
|
||||
bb.monthly_increase_limit_expired_data_analysis_number +
|
||||
bb.invalid_increase_data_analysis_number +
|
||||
bb.increase_limit_data_analysis_consumption_number +
|
||||
bb.increase_limit_data_analysis_expired_consumption_number -
|
||||
bb.monthly_increase_limit_expired_data_analysis_consumption_number -
|
||||
bb.monthly_increase_limit_data_analysis_consumption_number
|
||||
bb.increase_limit_data_analysis_expired_consumption_number
|
||||
) AS data_analysis
|
||||
`). // 不限制类型的总数 + 限制不过期类型的当月可用 + 限制过期类型的当月可用 + 限制不过期类型的总共已用 + 限制过期类型的总共已用 + 已过期的数量 = 总发放数
|
||||
Joins("LEFT JOIN bundle_order_records bor ON bor.uuid = bb.order_uuid").
|
||||
@ -594,7 +582,7 @@ func getIncreaseBalanceInfo(month string, bundleUUID string) (data BalanceInfo)
|
||||
func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle.MetricsOperatingStatusResp, err error) {
|
||||
data = &bundle.MetricsOperatingStatusResp{}
|
||||
var statistic = func(status int8, workCategory int8) (i int64) {
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).Where(model.CastWork{Status: status, WorkCategory: workCategory}).Where("deleted_at = 0 and created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).Count(&i)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).Where(model.CastWork{Status: status, WorkCategory: workCategory}).Where("deleted_at = 0 and created_at <= ?", timeParse(req.Date).Unix()).Count(&i)
|
||||
return
|
||||
}
|
||||
//视频
|
||||
@ -606,16 +594,8 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle
|
||||
data.UploadFailedVideoCount = statistic(7, 2)
|
||||
data.PendingUploadVideoCount = statistic(8, 2)
|
||||
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).
|
||||
Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").
|
||||
Where("cwl.work_category = 2 and cwl.work_status = 9 and cast_work.deleted_at = 0 and operator_id != ?", "0").
|
||||
Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
|
||||
Count(&data.ArtistConfirmVideoCount)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).
|
||||
Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").
|
||||
Where("cwl.work_category = 2 and cwl.work_status = 9 and cast_work.deleted_at = 0 and operator_id = ?", "0").
|
||||
Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
|
||||
Count(&data.AutoConfirmVideoCount)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").Where("cwl.work_category = 2 and cwl.work_status = 9 and deleted_at = 0 and operator_id != ?", "0").Count(&data.ArtistConfirmVideoCount)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").Where("cwl.work_category = 2 and cwl.work_status = 9 and deleted_at = 0 and operator_id = ?", "0").Count(&data.AutoConfirmVideoCount)
|
||||
|
||||
//图文
|
||||
data.DraftImageCount = statistic(1, 1)
|
||||
@ -626,16 +606,8 @@ func MetricsOperatingStatus(req *bundle.MetricsOperatingStatusReq) (data *bundle
|
||||
data.UploadFailedImageCount = statistic(7, 1)
|
||||
data.PendingUploadImageCount = statistic(8, 1)
|
||||
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).
|
||||
Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").
|
||||
Where("cwl.work_category = 1 and cwl.work_status = 9 and cast_work.deleted_at = 0 and operator_id != ?", "0").
|
||||
Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
|
||||
Count(&data.ArtistConfirmImageCount)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).
|
||||
Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").
|
||||
Where("cwl.work_category = 1 and cwl.work_status = 9 and cast_work.deleted_at = 0 and operator_id = ?", "0").
|
||||
Where("cast_work.created_at <= ?", timeParse(req.Date+" 23:59:59").Unix()).
|
||||
Count(&data.AutoConfirmImageCount)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").Where("cwl.work_category = 1 and cwl.work_status = 9 and deleted_at = 0 and operator_id != ?", "0").Count(&data.ArtistConfirmImageCount)
|
||||
app.ModuleClients.BundleDB.Model(model.CastWork{}).Joins("left join cast_work_log cwl on cwl.work_uuid = cast_work.uuid").Where("cwl.work_category = 1 and cwl.work_status = 9 and deleted_at = 0 and operator_id = ?", "0").Count(&data.AutoConfirmImageCount)
|
||||
//======================数据分析暂时未做======================
|
||||
return
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user