diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index a7e5e7af4..812b39a63 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -10,6 +10,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals" ) type SkuNamesInfo struct { @@ -188,10 +189,6 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter sql += ")" } - if params["nameID"] != nil { - sql += " AND t1.id = ?" - sqlParams = append(sqlParams, params["nameID"].(int)) - } if params["nameIDs"] != nil { var nameIDs []int if err = utils.UnmarshalUseNumber([]byte(params["nameIDs"].(string)), &nameIDs); err != nil { @@ -216,9 +213,15 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter } sql += ")" } - if params["jdID"] != nil { - sql += " AND t1.jd_id = ?" - sqlParams = append(sqlParams, params["jdID"].(int)) + if params["vendorSkuIDs"] != nil { + var vendorSkuIDs []int + if err = utils.UnmarshalUseNumber([]byte(params["vendorSkuIDs"].(string)), &vendorSkuIDs); err != nil { + return nil, err + } + if len(vendorSkuIDs) > 0 { + sql += " AND t2.jd_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")" + sqlParams = append(sqlParams, vendorSkuIDs) + } } if params["name"] != nil { sql += " AND t1.name LIKE ?" @@ -254,10 +257,6 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter sql += sqlPlaceCond + ")" } } - if params["skuID"] != nil { - sql += " AND t2.id = ?" - sqlParams = append(sqlParams, params["skuID"].(int)) - } if params["skuIDs"] != nil { var skuIDs []int if err = utils.UnmarshalUseNumber([]byte(params["skuIDs"].(string)), &skuIDs); err != nil { @@ -329,6 +328,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter panic(r) } }() + globals.SugarLogger.Debug(sqlData) + globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false)) if err = dao.GetRows(db, &skuNamesInfo.SkuNames, sqlData, sqlParams...); err == nil { countInfo := &struct{ Ct int }{} if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil { diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index 36b0d9d60..dc829838d 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -131,10 +131,9 @@ func (c *SkuController) SyncCategory() { // @Description 得到商品信息,如下条件之间是与的关系 // @Param token header string true "认证token" // @Param keyword query string false "查询关键字(可以为空,为空表示不限制)" -// @Param nameID query int false "SkuName ID,废弃,请使用nameIDs" // @Param nameIDs query string false "SkuName IDs列表" -// @Param skuID query int false "Sku ID,废弃,请使用skuDs" // @Param skuIDs query string false "Sku ID列表" +// @Param vendorSkuIDs query string false "厂商SKU ID列表" // @Param name query string false "商品名称(不要求完全一致)" // @Param prefix query string false "商品前缀(不要求完全一致)" // @Param placeCond query string false "查询地点的条件(如果此字段没有设置,placeCode与isGlobal无效),and:与,or:或,指的是placeCode,isGlobal这两个条件间的关系,这组条件与其它条件都是与的关系" @@ -142,7 +141,6 @@ func (c *SkuController) SyncCategory() { // @Param isGlobal query bool false "是否全球可售" // @Param categoryID query int false "商品所属类别ID" // @Param unit query string false "商品单位" -// @Param jdID query int false "商品京东ID" // @Param fromStatus query int false "查询起始状态(0:下架,1:正常)" // @Param toStatus query int false "查询起始状态(0:下架,1:正常)" // @Param offset query int false "门店列表起始序号(以0开始,缺省为0)"