diff --git a/internal/api/manage/activity/create.go b/internal/api/manage/activity/create.go index 5d9959f..bab8fad 100755 --- a/internal/api/manage/activity/create.go +++ b/internal/api/manage/activity/create.go @@ -1,12 +1,13 @@ package activity import ( - "github.com/gin-gonic/gin" "recook/internal/back" "recook/internal/dbc" "recook/internal/model/activity" "recook/internal/model/manage" "recook/tools" + + "github.com/gin-gonic/gin" ) type subGoodsInfo struct { @@ -24,6 +25,7 @@ type createActivityParam struct { TopUrl string `json:"topUrl" validator:"required"` GoodsList []subGoodsInfo `json:"goodsList" validator:"required"` Status uint `json:"status"` //新增模块选项 传1或2 1单个,2并列 + IsSale bool `json:"is_sale"` } func CreateActivity(c *gin.Context) { @@ -78,6 +80,7 @@ func CreateActivity(c *gin.Context) { UserID: user.ID, UserName: user.Name, Status: p.Status, + IsSale: p.IsSale, } if err = tx.Create(info).Error; err != nil { back.Fail(c, err.Error()) diff --git a/internal/api/manage/activity/query.go b/internal/api/manage/activity/query.go index 96b84d2..b0da198 100755 --- a/internal/api/manage/activity/query.go +++ b/internal/api/manage/activity/query.go @@ -1,11 +1,12 @@ package activity import ( - "github.com/gin-gonic/gin" "recook/internal/back" "recook/internal/dbc" "recook/internal/model/activity" "recook/tools" + + "github.com/gin-gonic/gin" ) type queryParam struct { @@ -24,7 +25,8 @@ type customResp struct { } type queryPageParam struct { - Page int64 `json:"page" validate:"numeric"` + Page int64 `json:"page" validate:"numeric"` + IsSale bool `json:"is_sale"` } func QueryActivityList(c *gin.Context) { @@ -104,8 +106,9 @@ func QueryNewActivityList(c *gin.Context) { // 页面只显示 id, name, 创建时间 var activities = make([]activity.Info, 10) - dbc.DB.Table("recook_activity_info").Limit(limit).Offset((page.Page-1)*limit).Where("is_active=?", isActive).Scan(&activities) - dbc.DB.Table("recook_activity_info").Where("is_active=?", 1).Count(&count) + dbc.DB.Table("recook_activity_info"). + Limit(limit).Offset((page.Page-1)*limit).Where("is_sale = ?", page.IsSale).Where("is_active=?", isActive).Scan(&activities) + dbc.DB.Table("recook_activity_info").Where("is_sale = ?", page.IsSale).Where("is_active=?", 1).Count(&count) back.Suc(c, "", &queryActListResp{ List: activities, diff --git a/internal/api/manage/activity/update.go b/internal/api/manage/activity/update.go index ff26792..58ac465 100755 --- a/internal/api/manage/activity/update.go +++ b/internal/api/manage/activity/update.go @@ -1,12 +1,13 @@ package activity import ( - "github.com/gin-gonic/gin" "recook/internal/back" "recook/internal/dbc" "recook/internal/model/activity" "recook/internal/model/manage" "recook/tools" + + "github.com/gin-gonic/gin" ) type removeGoodsParams struct { @@ -108,6 +109,7 @@ func UpdateActivity(c *gin.Context) { UserID: user.ID, UserName: user.Name, Status: p.Status, + IsSale: actInfo.IsSale, } if err = tx.Save(&info).Error; err != nil { back.Fail(c, err.Error()) diff --git a/internal/model/activity/info.go b/internal/model/activity/info.go index 58d04f4..d70b262 100755 --- a/internal/model/activity/info.go +++ b/internal/model/activity/info.go @@ -16,6 +16,7 @@ type Info struct { UserName string `gorm:"user_name" json:"user_name"` UpdatedAt formatime.Second `gorm:"updated_at" json:"updated_at"` Status uint `gorm:"column:status" json:"status"` + IsSale bool `gorm:"column:is_sale" json:"is_sale"` } func (*Info) TableName() string {