Merge branch 'banner_mark'

controller/public.go

@@ -10,6 +10,7 @@ import (
 	"hongze/hongze_yb/logic"
 	"hongze/hongze_yb/models/request"
 	respond "hongze/hongze_yb/models/response"
+	"hongze/hongze_yb/models/tables/banner"
 	"hongze/hongze_yb/models/tables/banner_view_history"
 	"hongze/hongze_yb/models/tables/company"
 	"hongze/hongze_yb/models/tables/wx_user"
@@ -372,10 +373,10 @@ func BannerMark(c *gin.Context) {
 		return
 	}
 
-	if req.BannerUrl == "" {
-		response.FailMsg("参数有误", "BannerUrl不能为空", c)
-		return
-	}
+	//if req.BannerUrl == "" {
+	//	response.FailMsg("参数有误", "BannerUrl不能为空", c)
+	//	return
+	//}
 
 	if req.FirstSource <= 0 {
 		response.FailMsg("参数有误", "FirstSource不能为空", c)
@@ -386,6 +387,16 @@ func BannerMark(c *gin.Context) {
 		response.FailMsg("参数有误", "SecondSource", c)
 	}
 
+	if req.Id <= 0 {
+		response.FailMsg("参数有误", "Id错误", c)
+	}
+
+
+	item, err := banner.GetBannerById(req.Id)
+	if err != nil {
+		fmt.Println("GetByUserId:", err.Error())
+		return
+	}
 
 	// 联系人信息
 	strInt64 := strconv.FormatUint(userInfo.UserID, 10)
@@ -416,7 +427,7 @@ func BannerMark(c *gin.Context) {
 		LastUpdatedTime: time.Now(),
 		FirstSource:     req.FirstSource,
 		SecondSource:    req.SecondSource,
-		BannerUrl:       "https://hzstatic.hzinsights.com/yb_xcx/banner.png",
+		BannerUrl:       item.ImageUrlPc,
 	}
 	err = banner_view_history.AddBannerViewHistory()
 	if err != nil {
@@ -425,3 +436,25 @@ func BannerMark(c *gin.Context) {
 
 	response.Ok("成功", c)
 }
+
+
+// BannerList banner图列表
+// @Tags 公共模块
+// @Summary  banner图列表
+// @Description banner图列表
+// @Security ApiKeyAuth
+// @securityDefinitions.basic BasicAuth
+// @Accept  json
+// @Product json
+// @Success 200 {string} string 获取验证码成功
+// @Failure 400 {string} string 请输入邮箱地址
+// @Router /banner/list [get]
+func BannerList(c *gin.Context) {
+	list, err := banner.GetBannerList()
+	if err != nil {
+		response.FailMsg("获取失败", "获取banner失败, Err: "+err.Error(), c)
+		return
+	}
+
+	response.OkData("获取成功", list, c)
+}

models/request/public.go

@@ -25,4 +25,5 @@ type BannerMarkReq struct {
 	BannerUrl    string `json:"banner_url"`
 	FirstSource  int    `json:"first_source" description:"一级来源 1小程序移动 2小程序pc 3研报官网"`
 	SecondSource int    `json:"second_source" description:"二级来源 1首页 2研报详情页"`
+	Id           int    `json:"id" description:"banner id"`
 }

models/tables/banner/banner.go

@@ -0,0 +1,20 @@
+package banner
+
+import "time"
+
+type Banner struct {
+	Id             int       `gorm:"column:id;primary_key;AUTO_INCREMENT" json:"id"`
+	ImageUrlMobile string    `gorm:"column:image_url_mobile" json:"image_url_mobile"`                 // 图片地址-小程序
+	ImageUrlPc     string    `gorm:"column:image_url_pc" json:"image_url_pc"`                         // 图片地址-pc
+	ImageUrlWeb    string    `gorm:"column:image_url_web" json:"image_url_web"`                       // 图片地址-web
+	CreateTime     time.Time `gorm:"column:create_time;default:CURRENT_TIMESTAMP" json:"create_time"` // 创建时间
+	ModifyTime     time.Time `gorm:"column:modify_time;default:CURRENT_TIMESTAMP" json:"modify_time"` // 修改时间
+	JumpUrlMobile  string    `gorm:"column:jump_url_mobile" json:"jump_url_mobile"`                   // 跳转路径-小程序
+	JumpUrlPc      string    `gorm:"column:jump_url_pc" json:"jump_url_pc"`                           // 跳转路径-pc
+	Enable         int       `gorm:"column:enable;default:1;NOT NULL" json:"enable"`                  // 1:有效，0:禁用
+}
+
+// Banner get sql table name.获取数据库表名
+func (m *Banner) TableName() string {
+	return "banner"
+}

models/tables/banner/query.go

@@ -0,0 +1,15 @@
+package banner
+
+import "hongze/hongze_yb/global"
+
+// GetBannerList
+func GetBannerList() (list []*Banner, err error) {
+	err = global.DEFAULT_MYSQL.Where(" enable=1 ").Find(&list).Error
+	return
+}
+
+// GetBannerById
+func GetBannerById(id int) (item *Banner, err error) {
+	err = global.DEFAULT_MYSQL.Where(" id=? ",id).First(&item).Error
+	return
+}

routers/public.go

@@ -29,6 +29,7 @@ func initPublic(r *gin.Engine) {
 		rGroup.POST("/wechat_warning", controller.WechatWarning)
 		rGroup.POST("/view_log/update", controller.UpdateViewLog)
 		rGroup.POST("/banner/mark", controller.BannerMark)
+		rGroup.GET("/banner/list", controller.BannerList)
 	}
 
 	rGroup2 := r.Group("api/public")