From 7edb19ac523942ab6309fe53a7b5312900d6d862 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Fri, 1 Sep 2023 16:37:00 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/system_store_sku.go | 4 ---- business/partner/purchase/mtwm/store_sku2.go | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 289f23ce3..d1d8ad8e3 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -4,8 +4,6 @@ import ( "fmt" "time" - "git.rosy.net.cn/jx-callback/globals" - "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" @@ -134,9 +132,7 @@ func BatchInitData(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mt foodData["min_order_count"] = 1 } foodData["unit"] = storeSku.Unit - globals.SugarLogger.Debugf("BatchInitData storeSku=%s", utils.Format4Output(storeSku, false)) attr := mtwm.SwitchAttr(toApi, vendorStoreID, int64(storeSku.TagID), 0, storeSku.Name) - globals.SugarLogger.Debugf("BatchInitData attr=%s", attr) if attr != "" { foodData["common_attr_value"] = attr } diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 462fb8ce3..e0da17a2b 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -500,15 +500,15 @@ func SwitchAttr(apiObj *mtwmapi.API, vendorStoreID string, vendorCatID int64, na attrValue CommonAttrValue attrValues []CommonAttrValue ) - if nameID != 0 { //是否为纯创建 - globals.SugarLogger.Debugf("SwitchAttr nameID=%d", nameID) - if tData, err := dao.GetSkuNames(db, []int{nameID}, nil, "", false); err == nil && len(tData) > 0 { - globals.SugarLogger.Debugf("SwitchAttr tData=%s", utils.Format4Output(tData, false)) - if tData[0].MtAttribute != "[]" && tData[0].MtAttribute != "{}" && tData[0].MtAttribute != "" { - return tData[0].MtAttribute - } + //if nameID != 0 { //是否为纯创建 + globals.SugarLogger.Debugf("SwitchAttr nameID=%d", nameID) + if tData, err := dao.GetSkuNames(db, []int{nameID}, nil, "", false); err == nil && len(tData) > 0 { + globals.SugarLogger.Debugf("SwitchAttr tData=%s", utils.Format4Output(tData, false)) + if tData[0].MtAttribute != "[]" && tData[0].MtAttribute != "{}" && tData[0].MtAttribute != "" { + return tData[0].MtAttribute } } + //} if vendorCatID == 0 { //创建商品时无分类，使用推荐分类 if comTag, err := apiObj.RetailRecommendTag(name, vendorStoreID, 0, mtwmapi.TypeCategory); err == nil && comTag.TagID != 0 { tempCatID = int64(comTag.TagID)