diff --git a/app/svc/svc_data_center_generate_data.go b/app/svc/svc_data_center_generate_data.go index 1e5881c..45b410f 100644 --- a/app/svc/svc_data_center_generate_data.go +++ b/app/svc/svc_data_center_generate_data.go @@ -127,7 +127,7 @@ func DataCenterGenerateDataList(c *gin.Context, req md.DataCenterGenerateDataReq if len(MediumList) > 0 { NewOriginalWxAdDataDb := implement.NewOriginalWxAdDataDb(engine) for _, v := range MediumList { - wxData, _ := NewOriginalWxAdDataDb.GetOriginalWxAdData(v.Id) + wxData, _ := NewOriginalWxAdDataDb.GetOriginalWxAdData(v.OriginalDataId) var tmp = md.DataCenterGenerateDataData{ Id: utils.IntToStr(v.Id), ExposureCount: utils.IntToStr(v.ExposureCount), diff --git a/app/svc/svc_data_center_original_data.go b/app/svc/svc_data_center_original_data.go index 0c38e42..4846b93 100644 --- a/app/svc/svc_data_center_original_data.go +++ b/app/svc/svc_data_center_original_data.go @@ -36,7 +36,7 @@ func DataCenterOriginalDataList(c *gin.Context, req md.DataCenterOriginalDataReq ClickRate: v.ClickRate, Date: v.Date, PublisherIncome: utils.Float64ToStr(float64(v.PublisherIncome) / 100), - Ecpm: utils.Float64ToStr(utils.StrToFloat64(v.Ecpm) / 100), + Ecpm: utils.Float64ToStr(float64(utils.StrToInt(v.Ecpm)) / 100), IsApply: utils.IntToStr(v.IsApply), } tmpApplet := GetAppletInfo(c, v.AppId) @@ -193,8 +193,8 @@ func DataCenterOriginalDataTotal(c *gin.Context, req md.DataCenterOriginalDataCo ExtraRevenueRate: utils.IntToStr(strategy.ExtraRevenueRate), AgreementSharingRate: utils.IntToStr(strategy.AgreementSharingRate), ExposureCount: utils.IntToStr(data.ExposureCount), - Ecpm: utils.Float64ToStr(utils.StrToFloat64(ecpm) / 100), - OldEcpm: utils.Float64ToStr(utils.StrToFloat64(data.Ecpm) / 100), + Ecpm: utils.Float64ToStr(float64(utils.StrToInt(ecpm)) / 100), + OldEcpm: utils.Float64ToStr(float64(utils.StrToInt(data.Ecpm)) / 100), PlatformRetention: utils.Float64ToStr(appData.PlatformRetention / 100), CommissionRetention: utils.Float64ToStr(appData.CommissionRetention / 100), MediaRevenue: utils.Float64ToStr(appData.MediaRevenue / 100),