diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index 4c87ddd34..9bab03823 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -255,15 +255,20 @@ func vendorSku2Jx(vendorSku *ebaiapi.SkuInfo) (skuName *partner.SkuNameInfo) { if weight <= 0 { weight = jxutils.FormatSkuWeight(specQuality, specUnit) } + skuID := int(utils.Str2Int64WithDefault(vendorSku.CustomSkuID, 0)) + vendorSkuID := utils.Int64ToStr(vendorSku.SkuID) skuName = &partner.SkuNameInfo{ + NameID: skuID, + VendorNameID: vendorSkuID, + Prefix: prefix, Name: name, Unit: unit, SkuList: []*partner.SkuInfo{ &partner.SkuInfo{ StoreSkuInfo: partner.StoreSkuInfo{ - VendorSkuID: utils.Int64ToStr(vendorSku.SkuID), - SkuID: int(utils.Str2Int64WithDefault(vendorSku.CustomSkuID, 0)), + VendorSkuID: vendorSkuID, + SkuID: skuID, Stock: vendorSku.LeftNum, Price: vendorSku.SalePrice, diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index bac8c62a6..6c319b8ef 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -268,48 +268,52 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas return skuNameList, err } -func vendorSku2Jx(vendorSku *mtwmapi.AppFood) (skuName *partner.SkuNameInfo) { - prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(vendorSku.Name) - mtwmSku := vendorSku.SkuList[0] - weight := mtwmSku.Weight +func vendorSku2Jx(appFood *mtwmapi.AppFood) (skuName *partner.SkuNameInfo) { + prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(appFood.Name) + vendorSku := appFood.SkuList[0] + weight := vendorSku.Weight if weight <= 0 { weight = jxutils.FormatSkuWeight(specQuality, specUnit) } + skuID := int(utils.Str2Int64WithDefault(vendorSku.SkuID, 0)) skuName = &partner.SkuNameInfo{ + NameID: skuID, + VendorNameID: vendorSku.SkuID, + Prefix: prefix, Name: name, Unit: unit, SkuList: []*partner.SkuInfo{ &partner.SkuInfo{ StoreSkuInfo: partner.StoreSkuInfo{ - VendorSkuID: mtwmSku.SkuID, - SkuID: int(utils.Str2Int64WithDefault(mtwmSku.SkuID, 0)), + VendorSkuID: vendorSku.SkuID, + SkuID: skuID, - Stock: int(utils.Str2Int64WithDefault(mtwmSku.Stock, partner.UnlimitedStoreSkuStock)), - Price: jxutils.StandardPrice2Int(utils.Str2Float64WithDefault(mtwmSku.Price, 0)), - Status: mtwmSkuStatus2Jx(vendorSku.IsSoldOut), + Stock: int(utils.Str2Int64WithDefault(vendorSku.Stock, partner.UnlimitedStoreSkuStock)), + Price: jxutils.StandardPrice2Int(utils.Str2Float64WithDefault(vendorSku.Price, 0)), + Status: mtwmSkuStatus2Jx(appFood.IsSoldOut), }, - SkuName: vendorSku.Name, + SkuName: appFood.Name, Comment: comment, SpecQuality: float64(specQuality), SpecUnit: specUnit, Weight: weight, }, }, - PictureList: vendorSku.PictureList, + PictureList: appFood.PictureList, } - if vendorSku.CategoryName != "" { - skuName.VendorCatIDList = []string{vendorSku.CategoryName} - if vendorSku.SecondaryCategoryName != "" { - skuName.VendorCatIDList = append(skuName.VendorCatIDList, vendorSku.SecondaryCategoryName) + if appFood.CategoryName != "" { + skuName.VendorCatIDList = []string{appFood.CategoryName} + if appFood.SecondaryCategoryName != "" { + skuName.VendorCatIDList = append(skuName.VendorCatIDList, appFood.SecondaryCategoryName) } } return skuName } -func vendorSkuList2Jx(vendorSkuList []*mtwmapi.AppFood) (skuNameList []*partner.SkuNameInfo) { - for _, vendorSku := range vendorSkuList { - skuNameList = append(skuNameList, vendorSku2Jx(vendorSku)) +func vendorSkuList2Jx(appFoodList []*mtwmapi.AppFood) (skuNameList []*partner.SkuNameInfo) { + for _, appFood := range appFoodList { + skuNameList = append(skuNameList, vendorSku2Jx(appFood)) } return skuNameList }