更新

app/md/md_data_center_generate_data.go

@@ -9,6 +9,7 @@ type DataCenterGenerateDataReq struct {
 	StartTime string `json:"start_time"`
 	EndTime   string `json:"end_time"`
 	AppId     string `json:"app_id"`
+	AdType    string `json:"ad_type"`
 }
 
 type DataCenterGenerateDataForOpenReq struct {

app/svc/svc_data_center_generate_data.go

@@ -22,7 +22,7 @@ func DataCenterIncomeDataListForOpen(c *gin.Context, req md.DataCenterGenerateDa
 	engine := db.Db
 	NewGenerateWxAdDataDb := implement.NewGenerateWxAdDataDb(engine)
 	mediumId := req.MediumId
-	MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), "", mediumId, "", req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
+	MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), "", mediumId, "", "", req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
 	data := make([]md.DataCenterIncomeDataData, 0)
 	if len(MediumList) > 0 {
 		for _, v := range MediumList {
@@ -71,7 +71,7 @@ func DataCenterIncomeDataList(c *gin.Context, req md.DataCenterGenerateDataReq)
 	appId := GetAppletId(c, req.Name, req.Platform, req.AppId)
 	mediumId := GetMediumIdStr(c, user.AdmId, "", "")
 	slotId := GetSlotId(c, req.State)
-	MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), appId, mediumId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
+	MediumList, total, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMedium(c.GetString("mid"), appId, mediumId, slotId, req.AdType, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
 	data := make([]md.DataCenterIncomeDataData, 0)
 	if len(MediumList) > 0 {
 		for _, v := range MediumList {
@@ -121,7 +121,7 @@ func DataCenterIncomeDataListOutput(c *gin.Context, req md.DataCenterGenerateDat
 	mediumId := GetMediumIdStr(c, user.AdmId, "", "")
 	slotId := GetSlotId(c, req.State)
 	req.Limit = "3000"
-	MediumList, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMediumAll(c.GetString("mid"), appId, mediumId, slotId, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
+	MediumList, _ := NewGenerateWxAdDataDb.FindGenerateWxAdDataListMediumAll(c.GetString("mid"), appId, mediumId, slotId, req.AdType, req.StartTime, req.EndTime, utils.StrToInt(req.Page), utils.StrToInt(req.Limit))
 	data := map[string]string{
 		"A1": "名称",
 		"B1": "日期",

go.mod

@@ -36,7 +36,7 @@ require (
 require (
 	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/zhimeng/model.git v0.0.3-0.20241028073907-ef7ecbd0db8d
+	code.fnuoos.com/zhimeng/model.git v0.0.3-0.20241029082303-49c46bad02b0
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/gin-contrib/cors v1.7.2
 	github.com/jinzhu/copier v0.4.0