From 1b117a2799d1b6c304558b1324cb6858097e0d7e Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Wed, 9 Oct 2024 14:24:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/svc/svc_finance_index.go | 5 +++-- app/svc/svc_index.go | 5 +++-- app/svc/svc_operator_index.go | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/svc/svc_finance_index.go b/app/svc/svc_finance_index.go index f17b809..e659ee9 100644 --- a/app/svc/svc_finance_index.go +++ b/app/svc/svc_finance_index.go @@ -116,7 +116,7 @@ func FinanceBeforeSevenPoint(c *gin.Context, req md.IndexAppListTableReq) map[st for _, v := range date { for k1, v1 := range dateList { if strings.Contains(v1, v["date"]) { - appData[v["app_id"]][k1] = utils.Float64ToStr(utils.StrToFloat64(appData[v["app_id"]][k1]) + utils.StrToFloat64(v["media_revenue"])) + appData[v["app_id"]][k1] = utils.Float64ToStr(utils.StrToFloat64(appData[v["app_id"]][k1]) + utils.StrToFloat64(v["media_revenue"])/100) } } } @@ -160,7 +160,7 @@ func FinanceIndexAppList(c *gin.Context, req md.IndexAppListReq) md.IndexAppList } dataList := []md.IndexAppListDataList{ {Name: "广告预估收益", Type: "media_revenue", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "media_revenue"), Value: utils.Float64ToStr(utils.StrToFloat64(v["media_revenue"]) / 100)}, - {Name: "ECPM", Type: "ecpm", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "ecpm"), Value: utils.Float64ToStr(utils.StrToFloat64(v["ecpm"]) / float64(day))}, + {Name: "ECPM", Type: "ecpm", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "ecpm"), Value: utils.Float64ToStr(utils.StrToFloat64(v["ecpm"]) / 100 / utils.StrToFloat64(v["count"]))}, {Name: "曝光量", Type: "exposure_count", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "exposure_count"), Value: v["exposure_count"]}, {Name: "点击量", Type: "click_count", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "click_count"), Value: v["click_count"]}, {Name: "点击率", Type: "click_rate", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "click_rate"), Value: utils.GetPrec(v["click_rate"], "2") + "%"}, @@ -218,6 +218,7 @@ func commFinanceTotal(c *gin.Context, startDate, endDate string) []map[string]st func commFinanceTotalByApp(c *gin.Context, req md.IndexAppListReq, appId []string) []map[string]string { sql := ` SELECT + COUNT(*) as count, app_id as app_id, SUM(exposure_count) as exposure_count, SUM(click_count) as click_count, diff --git a/app/svc/svc_index.go b/app/svc/svc_index.go index c02548d..c96e6a8 100644 --- a/app/svc/svc_index.go +++ b/app/svc/svc_index.go @@ -128,7 +128,7 @@ func BeforeSevenPoint(c *gin.Context, req md.IndexAppListTableReq) map[string][] for _, v := range date { for k1, v1 := range dateList { if strings.Contains(v1, v["date"]) { - appData[v["app_id"]][k1] = utils.Float64ToStr(utils.StrToFloat64(appData[v["app_id"]][k1]) + utils.StrToFloat64(v["media_revenue"])) + appData[v["app_id"]][k1] = utils.Float64ToStr(utils.StrToFloat64(appData[v["app_id"]][k1]) + utils.StrToFloat64(v["media_revenue"])/100) } } } @@ -172,7 +172,7 @@ func IndexAppList(c *gin.Context, req md.IndexAppListReq) md.IndexAppListRes { } dataList := []md.IndexAppListDataList{ {Name: "广告预估收益", Type: "media_revenue", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "media_revenue"), Value: utils.Float64ToStr(utils.StrToFloat64(v["media_revenue"]) / 100)}, - {Name: "ECPM", Type: "ecpm", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "ecpm"), Value: utils.Float64ToStr(utils.StrToFloat64(v["ecpm"]) / float64(day))}, + {Name: "ECPM", Type: "ecpm", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "ecpm"), Value: utils.Float64ToStr(utils.StrToFloat64(v["ecpm"]) / 100 / utils.StrToFloat64(v["count"]))}, {Name: "曝光量", Type: "exposure_count", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "exposure_count"), Value: v["exposure_count"]}, {Name: "点击量", Type: "click_count", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "click_count"), Value: v["click_count"]}, {Name: "点击率", Type: "click_rate", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "click_rate"), Value: utils.GetPrec(v["click_rate"], "2") + "%"}, @@ -229,6 +229,7 @@ func commTotal(c *gin.Context, startDate, endDate string) []map[string]string { func commTotalByApp(c *gin.Context, req md.IndexAppListReq, appId []string) []map[string]string { sql := ` SELECT + COUNT(*) as count, app_id as app_id, SUM(exposure_count) as exposure_count, SUM(click_count) as click_count, diff --git a/app/svc/svc_operator_index.go b/app/svc/svc_operator_index.go index 51b97cd..19a7d9c 100644 --- a/app/svc/svc_operator_index.go +++ b/app/svc/svc_operator_index.go @@ -79,7 +79,7 @@ func OperatorBeforeSevenPoint(c *gin.Context, req md.IndexAppListTableReq) map[s for _, v := range date { for k1, v1 := range dateList { if strings.Contains(v1, v["date"]) { - appData[v["app_id"]][k1] = utils.Float64ToStr(utils.StrToFloat64(appData[v["app_id"]][k1]) + utils.StrToFloat64(v["media_revenue"])) + appData[v["app_id"]][k1] = utils.Float64ToStr(utils.StrToFloat64(appData[v["app_id"]][k1]) + utils.StrToFloat64(v["media_revenue"])/100) } } } @@ -123,7 +123,7 @@ func OperatorIndexAppList(c *gin.Context, req md.IndexAppListReq) md.IndexAppLis } dataList := []md.IndexAppListDataList{ {Name: "广告预估收益", Type: "media_revenue", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "media_revenue"), Value: utils.Float64ToStr(utils.StrToFloat64(v["media_revenue"]) / 100)}, - {Name: "ECPM", Type: "ecpm", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "ecpm"), Value: utils.Float64ToStr(utils.StrToFloat64(v["ecpm"]) / float64(day))}, + {Name: "ECPM", Type: "ecpm", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "ecpm"), Value: utils.Float64ToStr(utils.StrToFloat64(v["ecpm"]) / 100 / utils.StrToFloat64(v["count"]))}, {Name: "曝光量", Type: "exposure_count", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "exposure_count"), Value: v["exposure_count"]}, {Name: "点击量", Type: "click_count", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "click_count"), Value: v["click_count"]}, {Name: "点击率", Type: "click_rate", Bili: commBili(c, dataLastMap[v["app_id"]], tmpList, "click_rate"), Value: utils.GetPrec(v["click_rate"], "2") + "%"}, @@ -180,6 +180,7 @@ func commOperatorTotal(c *gin.Context, startDate, endDate string) []map[string]s func commOperatorTotalByApp(c *gin.Context, req md.IndexAppListReq, appId []string) []map[string]string { sql := ` SELECT + COUNT(*) as count, app_id as app_id, SUM(exposure_count) as exposure_count, SUM(click_count) as click_count,