liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2022-07-21 17:19:55 +08:00
parent 17cf89789d 4e6824a73e
commit c282b7d790
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/dao/store.go
View File

@@ -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 = ?

11
business/model/store.go
View File

@@ -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 {

4
controllers/cms_store.go
View File

@@ -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