From b18fca48fac2e0c6791154012467993616c493c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 1 Apr 2023 00:35:11 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/sku.go | 40 +++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 8567af23b..00c16d2fc 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1260,41 +1260,53 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n } } else { if payload["jdCategoryID"] != nil { - jdCategoryId = payload["jdCategoryID"].(string) - } else { - jdCategoryId = getCategoryByName(payload["name"].(string)) + value, ok := payload["jdCategoryID"].(string) + if ok && value != "" && value != "0" { + jdCategoryId = payload["jdCategoryID"].(string) + } else { + jdCategoryId = getCategoryByName(payload["name"].(string)) + } } if payload["jdsCategoryID"] != nil { - jdsCategoryID = payload["jdsCategoryID"].(string) + value, ok := payload["jdCategoryID"].(string) + if ok && value != "" && value != "0" { + jdsCategoryID = payload["jdsCategoryID"].(string) + } } if payload["ebaiCategoryID"] != nil { - ebaiCategoryID = payload["ebaiCategoryID"].(string) + value, ok := payload["ebaiCategoryID"].(string) + if ok && value != "" && value != "0" { + ebaiCategoryID = payload["ebaiCategoryID"].(string) + } } if payload["mtwmCategoryID"] != nil { - mtwmCategoryID = payload["mtwmCategoryID"].(string) + value, ok := payload["mtwmCategoryID"].(string) + if ok && value != "" && value != "0" { + mtwmCategoryID = payload["mtwmCategoryID"].(string) + } } if payload["categoryID2"] != nil && !utils.IsNil(payload["categoryID2"]) { var jxCategoryIDNumber int64 - if value, ok := payload["categoryID2"].(string); ok { + if value, ok := payload["categoryID2"].(string); ok && value != "" { jxCategoryIDNumber = utils.Str2Int64(value) } - if value, ok := payload["categoryID2"].(int64); ok { + if value, ok := payload["categoryID2"].(int64); ok && value != 0 { jxCategoryIDNumber = value } - if value, ok := payload["categoryID2"].(json.Number); ok { + if value, ok := payload["categoryID2"].(json.Number); ok && value != "" { jxCategoryIDNumber, _ = value.Int64() } jxCategoryID = int(jxCategoryIDNumber) } else if payload["categoryID"] != nil && !utils.IsNil(payload["categoryID"]) { var jxCategoryIDNumber int64 - if value, ok := payload["categoryID"].(string); ok { + if value, ok := payload["categoryID"].(string); ok && value != "" { jxCategoryIDNumber = utils.Str2Int64(value) } - if value, ok := payload["categoryID"].(int64); ok { + if value, ok := payload["categoryID"].(int64); ok && value != 0 { jxCategoryIDNumber = value } - if value, ok := payload["categoryID"].(json.Number); ok { + if value, ok := payload["categoryID"].(json.Number); ok && value != "" { jxCategoryIDNumber, _ = value.Int64() } jxCategoryID = int(jxCategoryIDNumber) @@ -1307,7 +1319,9 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n } if payload["ddCategoryID"] != nil { - ddCategoryID = payload["ddCategoryID"].(string) + if value, ok := payload["ddCategoryID"].(string); ok && value != "" { + ddCategoryID = value + } } else { ddCategoryID = getCategoryByImg(payload["descImg"].(string), payload["img"].(string), payload["img2"].(string), payload["img3"].(string), payload["img4"].(string), payload["img5"].(string)) }