From d9f25222301d9a080a9376047da6a1676de88c1d Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 21 Jul 2022 15:12:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0is=5Fhidden=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/store.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/business/model/store.go b/business/model/store.go index 3be90738c..58bb4da7a 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -732,11 +732,12 @@ func (l *FreightDeductionPack) Swap(i, j int) { type StoreCategoryMap struct { ModelIDCULD StoreID int `orm:"column(store_id)" json:"storeID"` - CategoryID int `orm:"column(category_id)" json:"categoryID"` // 这个是指对应的sku_category - StoreCategoryName string `orm:"size(255)" json:"name"` // 门店类别单独的名字 - StoreCategorySeq int `orm:"default(0)" json:"storeCategorySeq"` // 门店类别单独的序号 - Level int `json:"level"` // 门店类别单独的等级 - ParentID int `orm:"column(parent_id)" json:"parentID"` //门店类别父ID，和sku_category一致 + CategoryID int `orm:"column(category_id)" json:"categoryID"` // 这个是指对应的sku_category + StoreCategoryName string `orm:"size(255)" json:"name"` // 门店类别单独的名字 + StoreCategorySeq int `orm:"default(0)" json:"storeCategorySeq"` // 门店类别单独的序号 + Level int `json:"level"` // 门店类别单独的等级 + ParentID int `orm:"column(parent_id)" json:"parentID"` //门店类别父ID，和sku_category一致 + IsHidden int `orm:"column(is_hidden);default(1)" json:"isHidden"` //门店类别是否展示 1:展示 -1:不展示 } func (*StoreCategoryMap) TableUnique() [][]string { From 5d18efe79d64ea1604d88e9896879eeeba4bee2f Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 21 Jul 2022 15:20:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=88=ABcrud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 894cd2f85..588cc0ef3 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -849,8 +849,8 @@ func GetStoreCategoryMap(db *DaoDB, parentID, level, storeID, categoryID int) (s func InsertStoreCategories(db *DaoDB, userName string, storeID int) (err error) { sql := ` INSERT INTO store_category_map - (created_at, updated_at, last_operator, deleted_at, store_id, category_id, store_category_name, store_category_seq, level, parent_id) - SELECT ?, ?, ?, ?, ?, id, name, seq, level, parent_id + (created_at, updated_at, last_operator, deleted_at, store_id, category_id, store_category_name, store_category_seq, level, parent_id,is_hidden) + SELECT ?, ?, ?, ?, ?, id, name, seq, level, parent_id,is_hidden FROM sku_category WHERE deleted_at = ? AND is_exd_spec = ? From 4e6824a73e284d62ab2c653956b9c6a507eb7260 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 21 Jul 2022 17:07:05 +0800 Subject: [PATCH 3/3] add --- controllers/cms_store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/controllers/cms_store.go b/controllers/cms_store.go index 760def8fe..8fc03accd 100644 --- a/controllers/cms_store.go +++ b/controllers/cms_store.go @@ -792,6 +792,7 @@ func (c *StoreController) GetStoreCategoryNoDefault() { // @Param level formData int true "分类级别" // @Param parentID formData int true "分类父ID" // @Param storeCategroyName formData string true "类别name" +// @Param isHidden formData int true "是否隐藏" // @Param storeCategroySeq formData int true "类别序号" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -805,6 +806,7 @@ func (c *StoreController) AddStoreCategoryMap() { StoreCategorySeq: params.StoreCategroySeq, Level: params.Level, ParentID: params.ParentID, + IsHidden: params.IsHidden, } retVal, err = cms.AddStoreCategoryMap(params.Ctx, storeCategoryMap) return retVal, "", err @@ -819,6 +821,7 @@ func (c *StoreController) AddStoreCategoryMap() { // @Param storeCategroyName formData string false "类别name" // @Param level formData int true "分类级别" // @Param parentID formData int true "分类父ID" +// @Param isHidden formData int true "是否隐藏" // @Param isDelete formData bool false "是否是删除操作，默认false" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult @@ -830,6 +833,7 @@ func (c *StoreController) UpdateStoreCategoryMap() { StoreCategoryName: params.StoreCategroyName, Level: params.Level, ParentID: params.ParentID, + IsHidden: params.IsHidden, } retVal, err = cms.UpdateStoreCategoryMap(params.Ctx, params.ID, storeCategoryMap, params.IsDelete) return retVal, "", err