diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 124233889..370b1c5bb 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -83,7 +83,7 @@ func catCode2Str(catCode int) (catCodeStr string) { return catCodeStr } -func tryOriginCatName2Code(originName string) (catCodeStr string) { +func tryCatName2Code(originName string) (catCodeStr string) { if intValue := utils.Str2Int64WithDefault(originName, 0); intValue > 0 { catCodeStr = utils.Int64ToStr(intValue) if catCodeStr != originName { @@ -134,7 +134,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in if !(originName == catName && subCatName == "") { if globals.EnableMtwmStoreWrite { // err = api.MtwmAPI.RetailCatUpdate(vendorStoreID, originName, catName, subCatName, storeCat.Seq) - err = api.MtwmAPI.RetailCatUpdate2(vendorStoreID, tryOriginCatName2Code(originName), originName, catCode2Str(catCode), catName, catCode2Str(subCatCode), subCatName, storeCat.Seq) + err = api.MtwmAPI.RetailCatUpdate2(vendorStoreID, tryCatName2Code(originName), originName, catCode2Str(catCode), catName, catCode2Str(subCatCode), subCatName, storeCat.Seq) if storeCat.StoreCatSyncStatus&model.SyncFlagNewMask == 0 && // 修改分类名,但分类不存在 p.IsErrCategoryNotExist(err) && originName != "" { storeCat.StoreCatSyncStatus |= model.SyncFlagNewMask @@ -156,7 +156,7 @@ func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID in func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string) (err error) { if globals.EnableMtwmStoreWrite { // err = api.MtwmAPI.RetailCatDelete(vendorStoreID, vendorCatID) - err = api.MtwmAPI.RetailCatDelete2(vendorStoreID, tryOriginCatName2Code(vendorCatID), vendorCatID) + err = api.MtwmAPI.RetailCatDelete2(vendorStoreID, tryCatName2Code(vendorCatID), vendorCatID) } return err } @@ -204,7 +204,12 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI foodData["unit"] = storeSku.Unit foodData["box_num"] = 0 foodData["box_price"] = 0.0 - foodData["category_name"] = storeSku.VendorCatID + catCode := tryCatName2Code(storeSku.VendorCatID) + if catCode != "" { + foodData["category_code"] = catCode + } else { + foodData["category_name"] = storeSku.VendorCatID + } foodData["is_sold_out"] = skuStatusJX2Mtwm(storeSku.MergedStatus) foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.Img, storeSku.Img2), ",") if storeSku.DescImg != "" {