diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 3a12e93ed..e75b1b06c 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1149,27 +1149,28 @@ type aa struct { // 根据名称获取商品分类[京东] func getCategoryByName(name string) string { handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDJD).(partner.IPurchasePlatformStoreSkuHandler) - vendorCategoryId, err := handler.GetSkuCategoryIdByName("320406", name) - globals.SugarLogger.Debugf("getCategoryByName vendorCategoryId :%s", vendorCategoryId) - globals.SugarLogger.Debugf("getCategoryByName err :%v", err) + vendorCategoryId, _ := handler.GetSkuCategoryIdByName("320406", name) return vendorCategoryId } // 获取抖音商品分类[抖音] -func getCategoryByImg(img string) string { +func getCategoryByImg(img ...string) string { + imgs := make([]string, 0, 0) + for _, v := range img { + if v == "" { + continue + } + imgs = append(imgs, v) + } handler, _ := partner.GetPurchasePlatformFromVendorID(model.VendorIDDD).(partner.IPurchasePlatformStoreSkuHandler) - vendorCategoryId, err := handler.GetSkuCategoryIdByName("57939570", img) - globals.SugarLogger.Debugf("getCategoryByImg vendorCategoryId :%s", vendorCategoryId) - globals.SugarLogger.Debugf("getCategoryByImg err :%v", err) + vendorCategoryId, _ := handler.GetSkuCategoryIdByName("57939570", strings.Join(imgs, "|")) return vendorCategoryId } // 根据平台返回的分类id,获取本地绑定的映射分类id func getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID string) (string, string, string) { - globals.SugarLogger.Debugf("getJDCategoryLoadingLocalCategoryReflex 1111: %s,%s,%s,%s", jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID) cats, err := dao.GetCategoriesByName(dao.GetDB(), "", jdCategoryId) if len(cats) == 0 || err != nil { - globals.SugarLogger.Errorf("%v", fmt.Errorf("根据京东分类id设置美团/饿了么分类错误:%d,%v", len(cats), err)) return jdsCategoryID, ebaiCategoryID, mtwmCategoryID } else { if jdsCategoryID == "" && cats[0].JdsCategoryID != 0 { @@ -1182,7 +1183,6 @@ func getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCa mtwmCategoryID = utils.Int64ToStr(cats[0].MtwmCategoryID) } } - globals.SugarLogger.Debugf("getJDCategoryLoadingLocalCategoryReflex 2222: %s,%s,%s,%s", jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID) return jdsCategoryID, ebaiCategoryID, mtwmCategoryID } @@ -1221,7 +1221,6 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n mtwmCategoryID := "" ddCategoryID := "" if skuNameExt != nil { - globals.SugarLogger.Debugf("======skuNameExt :%s", utils.Format4Output(skuNameExt, false)) if skuNameExt.JdCategoryID != "" { jdCategoryId = skuNameExt.JdCategoryID } else { @@ -1240,39 +1239,36 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n ddCategoryID = skuNameExt.DdCategoryID } else { // 抖音是根据商品图片获取商品分类的! - imgs := fmt.Sprintf("%s|%s|%s|%s|%s|%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) - ddCategoryID = getCategoryByImg(imgs) + ddCategoryID = getCategoryByImg(skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) } } else { - globals.SugarLogger.Debugf("======payload :%s", utils.Format4Output(payload, false)) if payload["jdCategoryID"] != nil { jdCategoryId = payload["jdCategoryID"].(string) } else { jdCategoryId = getCategoryByName(payload["name"].(string)) } - if jdCategoryId != "" { - jdsCategoryID, ebaiCategoryID, mtwmCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, payload["jdsCategoryID"].(string), payload["ebaiCategoryID"].(string), payload["mtwmCategoryID"].(string)) - } else { + if payload["jdsCategoryID"] != nil { jdsCategoryID = payload["jdsCategoryID"].(string) + } + if payload["ebaiCategoryID"] != nil { ebaiCategoryID = payload["ebaiCategoryID"].(string) + } + if payload["mtwmCategoryID"] != nil { mtwmCategoryID = payload["mtwmCategoryID"].(string) } + if jdCategoryId != "" { + jdsCategoryID, ebaiCategoryID, mtwmCategoryID = getJDCategoryLoadingLocalCategoryReflex(jdCategoryId, jdsCategoryID, ebaiCategoryID, mtwmCategoryID) + } + if payload["ddCategoryID"] != nil { ddCategoryID = payload["ddCategoryID"].(string) } else { - imgs := fmt.Sprintf("%s|%s|%s|%s|%s|%s", skuNameExt.DescImg, skuNameExt.Img, skuNameExt.Img2, skuNameExt.Img3, skuNameExt.Img4, skuNameExt.Img5) - ddCategoryID = getCategoryByImg(imgs) + ddCategoryID = getCategoryByImg(payload["descImg"].(string), payload["img"].(string), payload["img2"].(string), payload["img3"].(string), payload["img4"].(string), payload["img5"].(string)) } } - globals.SugarLogger.Debugf("jdsCategoryID:%s", jdsCategoryID) - globals.SugarLogger.Debugf("ebaiCategoryID:%s", ebaiCategoryID) - globals.SugarLogger.Debugf("mtwmCategoryID:%s", mtwmCategoryID) - globals.SugarLogger.Debugf("ddCategoryID:%s", ddCategoryID) - globals.SugarLogger.Debugf("jdCategoryId:%s", jdCategoryId) - if jdsCategoryID != "" && jdsCategoryID != "0" { updateOrCreate(model.VendorIDJDShop, nameID, jdsCategoryID) flag = true