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

- QueryConfigs在无结果且key不为空时才返回错误

Browse Source
This commit is contained in:
gazebo
2019-07-17 09:53:32 +08:00
parent b50c505336
commit 178e7d2dfa
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxstore/cms/cms.go
View File

@@ -249,6 +249,9 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
} }
func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (err error) { func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (err error) {
if key == "" {
return fmt.Errorf("修改配置必须给定key")
}
if err = checkConfig(configType, value); err != nil { if err = checkConfig(configType, value); err != nil {
return err return err
} }

8
business/jxstore/cms/store.go
View File

@@ -793,9 +793,11 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
} }
valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName) valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName)
if valid["pricePercentagePack"] != nil { if valid["pricePercentagePack"] != nil {
_, err2 := dao.QueryConfigs(db, model.ConfigTypePricePack, utils.Interface2String(valid["pricePercentagePack"]), "") if pricePercentagePack := utils.Interface2String(valid["pricePercentagePack"]); pricePercentagePack != "" {
if err = err2; err != nil { _, err2 := dao.QueryConfigs(db, model.ConfigTypePricePack, pricePercentagePack, "")
return 0, err if err = err2; err != nil {
return 0, err
}
} }
} }
if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" { if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" {

2
business/model/dao/new_config.go
View File

@@ -31,7 +31,7 @@ func QueryConfigs(db *DaoDB, key, configType, keyword string) (configList []*mod
} }
err = GetRows(db, &configList, sql, sqlParams...) err = GetRows(db, &configList, sql, sqlParams...)
if err == nil && len(configList) == 0 { if err == nil && len(configList) == 0 && key != "" {
err = fmt.Errorf("条件:key:%s,type:%s,keyword:%s不能找到配置", key, configType, keyword) err = fmt.Errorf("条件:key:%s,type:%s,keyword:%s不能找到配置", key, configType, keyword)
} }
return configList, err return configList, err