This commit is contained in:
邹宗楠
2024-12-31 11:55:21 +08:00
parent dcff9513b9
commit 5d7359f89b
4 changed files with 51 additions and 30 deletions

View File

@@ -653,7 +653,10 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
t1.sell_point,
t1.sell_point_times,
t1.tiktok_attribute,
t1.mt_attribute
t1.mt_attribute,
t1.qua_pictures,
t1.qua_effective_date,
t1.qua_approval_date
`
if isBySku {
sqlData += " ,t2.id sku_id"
@@ -819,6 +822,9 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
return nil, errors.New("不为份的SKU NAME只能有一个SKU")
}
}
if skuNameExt.QuaPictures != "" && (skuNameExt.QuaEffectiveDate == 0 || skuNameExt.QuaApprovalDate == 0) {
return nil, errors.New("当商品资质图存在时,商品资质有效期和批准日期不能为空")
}
skuNameExt.Name = utils.TrimBlankChar(skuNameExt.Name)
if hasSensitiveWord, word := CheckHasSensitiveWord(skuNameExt.Name); hasSensitiveWord {
@@ -3485,6 +3491,9 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
t1.jds_stock_switch,
t1.preparation_time,
t1.mt_attribute,
t1.qua_pictures,
t1.qua_effective_date,
t1.qua_approval_date,
t1.best_seller
FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
@@ -3527,6 +3536,9 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
t1.preparation_time,
t1.best_seller,
t1.mt_attribute,
t1.qua_pictures,
t1.qua_effective_date,
t1.qua_approval_date,
t2.id sku_id
FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?