feat: 活动位置is_sale

internal/api/mobile/activity/query.go

@@ -2,7 +2,6 @@ package activity
 
 import (
 	"fmt"
-	mysql2 "git.oa00.com/go/mysql"
 	"recook/internal/back"
 	"recook/internal/dbc"
 	"recook/internal/domain"
@@ -12,6 +11,8 @@ import (
 	"strconv"
 	"time"
 
+	mysql2 "git.oa00.com/go/mysql"
+
 	"github.com/gin-gonic/gin"
 )
 
@@ -31,6 +32,10 @@ type customResp struct {
 	SortId  uint   `json:"sort_id"`
 }
 
+type activityReq struct {
+	IsSale bool `json:"is_sale"`
+}
+
 func QueryActivityList(c *gin.Context) {
 	//var A activity.Info
 	//dbc.DB.Select("logo_url").Last(&A, "type=1")
@@ -60,14 +65,21 @@ func QueryActivityList(c *gin.Context) {
 	//	},
 	//})
 
+	var p activityReq
+	err := tools.Params(&p, c)
+	if err != nil {
+		back.Fail(c, err.Error())
+		return
+	}
+
 	var list []viewTypeListRes
-	one := getTypeOne(1)
+	one := getTypeOne(1, p.IsSale)
 	list = append(list, one)
-	two := getTypeOne(2)
+	two := getTypeOne(2, p.IsSale)
 	list = append(list, two)
-	three := getTypeOne(3)
+	three := getTypeOne(3, p.IsSale)
 	list = append(list, three)
-	four := getTypeOne(4)
+	four := getTypeOne(4, p.IsSale)
 	list = append(list, four)
 	back.Suc(c, "ok", gin.H{
 		"a": customResp{
@@ -133,11 +145,16 @@ type viewTypeListRes struct {
 	SortId  uint   `json:"sort_id"`
 }
 
-func getTypeOne(tid uint) viewTypeListRes {
+func getTypeOne(tid uint, isSale bool) viewTypeListRes {
 	var cdn = domain.GetCDN() + "/website/www/activity/t.html?id="
 	var one rotation.RecookActivityTypeInfoModel
 	var oneList []rotation.RecookActivityTypeInfoModel
-	mysql2.Db.Table(one.TableName()).Where("is_active=?", 1).Where("type=?", tid).Where("start_time<=?", time.Now()).Where("end_time>=?", time.Now()).Find(&oneList)
+	mysql2.Db.Table(one.TableName()).
+		Where("is_sale=?", isSale).
+		Where("is_active=?", 1).
+		Where("type=?", tid).
+		Where("start_time<=?", time.Now()).
+		Where("end_time>=?", time.Now()).Find(&oneList)
 	now := time.Now().Unix()
 	var temp int64
 	var sid uint