feat:金刚区

internal/v2/controller/app/kingkong/kingkong.go

@@ -1,14 +1,15 @@
 package kingkong
 
 import (
-	mysql2 "git.oa00.com/go/mysql"
-	"github.com/gin-gonic/gin"
 	"recook/internal/back"
 	"recook/internal/dbc"
 	"recook/internal/v2/logic/app/kingkong"
 	"recook/internal/v2/model/recook/app/kingKongIcon"
 	"recook/internal/v2/model/recook/goods"
 	"recook/tools"
+
+	mysql2 "git.oa00.com/go/mysql"
+	"github.com/gin-gonic/gin"
 )
 
 type KingKongController struct {
@@ -44,11 +45,20 @@ type iconViewAll struct {
 	KingName string `json:"king_name"`
 }
 
+type iconReq struct {
+	IsSale bool `json:"is_sale"`
+}
+
 func (k *KingKongController) ViewIcon(c *gin.Context) {
+	var p iconReq
+	if err := tools.Params(&p, c); err != nil {
+		back.Fail(c, err.Error())
+		return
+	}
 	a := kingKongIcon.KingKongIcon{}
 	var icon []iconViewAll
 	var kingList []kingKongIcon.KingKongIcon
-	mysql2.Db.Table(a.TableName()).Preload("KingName").Order("status").Find(&kingList)
+	mysql2.Db.Table(a.TableName()).Preload("KingName").Order("status").Where("is_sale = ?", p.IsSale).Find(&kingList)
 	for _, v := range kingList {
 		icon = append(icon, iconViewAll{
 			Url:      v.Url,

internal/v2/logic/app/kingkong/logic.go

@@ -2,9 +2,10 @@ package kingkong
 
 import (
 	"errors"
+	"recook/internal/dbc"
+
 	mysql2 "git.oa00.com/go/mysql"
 	"github.com/golangkit/formatime"
-	"recook/internal/dbc"
 
 	"recook/internal/v2/model/recook/app/kingKongIcon"
 )
@@ -20,6 +21,7 @@ type KingUpdate struct {
 	Type       uint   `json:"type"`
 	KingNameId uint   `json:"king_name_id"`
 	Name       string `json:"name"`
+	IsSale     bool   `json:"is_sale"`
 }
 type KingUpdateVo struct {
 	UrlList []KingUpdate `json:"url_list"`
@@ -41,7 +43,7 @@ func (l *Logic) Update(p KingUpdateVo) error {
 				CreatedAt:  formatime.NewSecondNow(),
 				Name:       v.Name,
 			}
-			mysql2.Db.Model(&kingKongIcon.KingKongIcon{}).Where("sort_id=? and status=?", v.SortId, v.Type).Updates(&one)
+			mysql2.Db.Model(&kingKongIcon.KingKongIcon{}).Where("sort_id=? and status=? and is_sale = ?", v.SortId, v.Type, v.IsSale).Updates(&one)
 		}
 
 	}

internal/v2/model/recook/app/kingKongIcon/king.go

@@ -14,6 +14,7 @@ type KingKongIcon struct {
 	Name       string           `gorm:"column:name" json:"name"`
 	KingNameId uint             `gorm:"column:king_name_id" json:"king_name_id"`
 	KingName   RecookKingName   `gorm:"foreignKey:KingNameId"`
+	IsSale     bool             `json:"is_sale"`
 }
 
 func (r *KingKongIcon) TableName() string {