huangjiajun
1 week ago
2 changed files with 7 additions and 5 deletions
Unified View
Diff Options
-
+6 -4app/svc/svc_data_center_generate_data.go
-
+1 -1go.mod
+ 6
- 4
app/svc/svc_data_center_generate_data.go
View File
| @@ -18,9 +18,10 @@ func DataCenterIncomeDataList(c *gin.Context, req md.DataCenterGenerateDataReq) | |||||
| engine := db.Db | engine := db.Db | ||||
| NewGenerateWxAdDataDb := implement.NewGenerateWxAdDataDb(engine) | NewGenerateWxAdDataDb := implement.NewGenerateWxAdDataDb(engine) | ||||
| user := GetUser(c) | user := GetUser(c) | ||||
| appId := GetAppletIdByAdminId(c, user.AdmId, req.Name, req.Platform) | |||||
| appId := GetAppletId(c, req.Name, req.Platform) | |||||
| mediumId := GetMediumIdStr(c, user.AdmId, "", "") | |||||
| slotId := GetSlotId(c, req.State) | slotId := GetSlotId(c, req.State) | ||||
| MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), appId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit)) | |||||
| MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), appId, mediumId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit)) | |||||
| data := make([]md.DataCenterIncomeDataData, 0) | data := make([]md.DataCenterIncomeDataData, 0) | ||||
| if len(MediumList) > 0 { | if len(MediumList) > 0 { | ||||
| for _, v := range MediumList { | for _, v := range MediumList { | ||||
| @@ -122,9 +123,10 @@ func DataCenterGenerateDataList(c *gin.Context, req md.DataCenterGenerateDataReq | |||||
| engine := db.Db | engine := db.Db | ||||
| NewGenerateWxAdDataDb := implement.NewGenerateWxAdDataDb(engine) | NewGenerateWxAdDataDb := implement.NewGenerateWxAdDataDb(engine) | ||||
| user := GetUser(c) | user := GetUser(c) | ||||
| appId := GetAppletIdByAdminId(c, user.AdmId, req.Name, req.Platform) | |||||
| appId := GetAppletId(c, req.Name, req.Platform) | |||||
| mediumId := GetMediumIdStr(c, user.AdmId, "", "") | |||||
| slotId := GetSlotId(c, req.State) | slotId := GetSlotId(c, req.State) | ||||
| MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataList(c.GetString("mid"), appId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit)) | |||||
| MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataList(c.GetString("mid"), appId, mediumId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit)) | |||||
| data := make([]md.DataCenterGenerateDataData, 0) | data := make([]md.DataCenterGenerateDataData, 0) | ||||
| if len(MediumList) > 0 { | if len(MediumList) > 0 { | ||||
| NewOriginalWxAdDataDb := implement.NewOriginalWxAdDataDb(engine) | NewOriginalWxAdDataDb := implement.NewOriginalWxAdDataDb(engine) | ||||
+ 1
- 1
go.mod
View File
| @@ -36,7 +36,7 @@ require ( | |||||
| require ( | require ( | ||||
| code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 | code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 | ||||
| code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240830072333-a1980ffb256e | code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240830072333-a1980ffb256e | ||||
| code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241025014113-d86cf0dcee0e | |||||
| code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241025040814-725e7331c9a8 | |||||
| github.com/jinzhu/copier v0.4.0 | github.com/jinzhu/copier v0.4.0 | ||||
| ) | ) | ||||