zwxi пре 1 година
родитељ
комит
659c61dcc0
3 измењених фајлова са 22 додато и 5 уклоњено
  1. 15 5
      controller/public.go
  2. 1 0
      models/request/public.go
  3. 6 0
      models/tables/banner/query.go

+ 15 - 5
controller/public.go

@@ -373,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)
@@ -387,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)
@@ -417,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 {

+ 1 - 0
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"`
 }

+ 6 - 0
models/tables/banner/query.go

@@ -6,4 +6,10 @@ import "hongze/hongze_yb/global"
 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
 }