Merge branch 'banner_mark' into debug

controller/public.go

@@ -358,7 +358,6 @@ func GetTelAreaList(c *gin.Context) {
 	response.OkData("获取成功", respList, c)
 }
 
-
 // BannerMark banner图埋点
 // @Tags 公共模块
 // @Summary  banner图埋点
@@ -397,7 +396,6 @@ func BannerMark(c *gin.Context) {
 		response.FailMsg("参数有误", "Id错误", c)
 	}
 
-
 	item, err := banner.GetBannerById(req.Id)
 	if err != nil {
 		fmt.Println("GetByUserId:", err.Error())
@@ -446,7 +444,6 @@ func BannerMark(c *gin.Context) {
 	response.Ok("成功", c)
 }
 
-
 // BannerList banner图列表
 // @Tags 公共模块
 // @Summary  banner图列表
@@ -459,11 +456,26 @@ func BannerMark(c *gin.Context) {
 // @Failure 400 {string} string 请输入邮箱地址
 // @Router /banner/list [get]
 func BannerList(c *gin.Context) {
-	list, err := banner.GetBannerList()
+	isHomepage, _ := strconv.Atoi(c.Query("is_homepage"))
+	page, _ := strconv.Atoi(c.Query("page"))
+	limit, _ := strconv.Atoi(c.Query("limit"))
+	enable, _ := strconv.Atoi(c.Query("enable"))
+	cond := "  "
+	if enable == 0 {
+		cond = " enable = 0 "
+	} else {
+		cond = " enable = 1 "
+	}
+
+	if isHomepage != 1 {
+		cond = " AND id <> 9999"
+	}
+
+	list, err := banner.GetBannerList(cond, page, limit)
 	if err != nil {
 		response.FailMsg("获取失败", "获取banner失败, Err: "+err.Error(), c)
 		return
 	}
 
 	response.OkData("获取成功", list, c)
-}
+}

models/response/banner.go

@@ -0,0 +1,8 @@
+package response
+
+import "hongze/hongze_yb/models/tables/banner"
+
+type BannerRespItem struct {
+	List  []*banner.Banner
+	Enable int
+}

models/tables/banner/query.go

@@ -3,8 +3,8 @@ package banner
 import "hongze/hongze_yb/global"
 
 // GetBannerList
-func GetBannerList() (list []*Banner, err error) {
-	err = global.DEFAULT_MYSQL.Where(" enable=1 ").Find(&list).Error
+func GetBannerList(cond string, page, limit int) (list []*Banner, err error) {
+	err = global.DEFAULT_MYSQL.Where(cond).Limit(limit).Offset((page - 1) * limit).Find(&list).Error
 	return
 }