liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- up

Browse Source 
www.qq.com 183.3.226.35
This commit is contained in:
gazebo
2019-07-14 09:05:52 +08:00
parent f31b158259
commit 370f59793f
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/partner/purchase/ebai/store_sku2.go
View File

@@ -255,15 +255,20 @@ func vendorSku2Jx(vendorSku *ebaiapi.SkuInfo) (skuName *partner.SkuNameInfo) {
if weight <= 0 { if weight <= 0 {
weight = jxutils.FormatSkuWeight(specQuality, specUnit) weight = jxutils.FormatSkuWeight(specQuality, specUnit)
} }
skuID := int(utils.Str2Int64WithDefault(vendorSku.CustomSkuID, 0))
vendorSkuID := utils.Int64ToStr(vendorSku.SkuID)
skuName = &partner.SkuNameInfo{ skuName = &partner.SkuNameInfo{
NameID: skuID,
VendorNameID: vendorSkuID,
Prefix: prefix, Prefix: prefix,
Name: name, Name: name,
Unit: unit, Unit: unit,
SkuList: []*partner.SkuInfo{ SkuList: []*partner.SkuInfo{
&partner.SkuInfo{ &partner.SkuInfo{
StoreSkuInfo: partner.StoreSkuInfo{ StoreSkuInfo: partner.StoreSkuInfo{
VendorSkuID: utils.Int64ToStr(vendorSku.SkuID), VendorSkuID: vendorSkuID,
SkuID: int(utils.Str2Int64WithDefault(vendorSku.CustomSkuID, 0)), SkuID: skuID,
Stock: vendorSku.LeftNum, Stock: vendorSku.LeftNum,
Price: vendorSku.SalePrice, Price: vendorSku.SalePrice,

40
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -268,48 +268,52 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
return skuNameList, err return skuNameList, err
} }
func vendorSku2Jx(vendorSku *mtwmapi.AppFood) (skuName *partner.SkuNameInfo) { func vendorSku2Jx(appFood *mtwmapi.AppFood) (skuName *partner.SkuNameInfo) {
prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(vendorSku.Name) prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(appFood.Name)
mtwmSku := vendorSku.SkuList[0] vendorSku := appFood.SkuList[0]
weight := mtwmSku.Weight weight := vendorSku.Weight
if weight <= 0 { if weight <= 0 {
weight = jxutils.FormatSkuWeight(specQuality, specUnit) weight = jxutils.FormatSkuWeight(specQuality, specUnit)
} }
skuID := int(utils.Str2Int64WithDefault(vendorSku.SkuID, 0))
skuName = &partner.SkuNameInfo{ skuName = &partner.SkuNameInfo{
NameID: skuID,
VendorNameID: vendorSku.SkuID,
Prefix: prefix, Prefix: prefix,
Name: name, Name: name,
Unit: unit, Unit: unit,
SkuList: []*partner.SkuInfo{ SkuList: []*partner.SkuInfo{
&partner.SkuInfo{ &partner.SkuInfo{
StoreSkuInfo: partner.StoreSkuInfo{ StoreSkuInfo: partner.StoreSkuInfo{
VendorSkuID: mtwmSku.SkuID, VendorSkuID: vendorSku.SkuID,
SkuID: int(utils.Str2Int64WithDefault(mtwmSku.SkuID, 0)), SkuID: skuID,
Stock: int(utils.Str2Int64WithDefault(mtwmSku.Stock, partner.UnlimitedStoreSkuStock)), Stock: int(utils.Str2Int64WithDefault(vendorSku.Stock, partner.UnlimitedStoreSkuStock)),
Price: jxutils.StandardPrice2Int(utils.Str2Float64WithDefault(mtwmSku.Price, 0)), Price: jxutils.StandardPrice2Int(utils.Str2Float64WithDefault(vendorSku.Price, 0)),
Status: mtwmSkuStatus2Jx(vendorSku.IsSoldOut), Status: mtwmSkuStatus2Jx(appFood.IsSoldOut),
}, },
SkuName: vendorSku.Name, SkuName: appFood.Name,
Comment: comment, Comment: comment,
SpecQuality: float64(specQuality), SpecQuality: float64(specQuality),
SpecUnit: specUnit, SpecUnit: specUnit,
Weight: weight, Weight: weight,
}, },
}, },
PictureList: vendorSku.PictureList, PictureList: appFood.PictureList,
} }
if vendorSku.CategoryName != "" { if appFood.CategoryName != "" {
skuName.VendorCatIDList = []string{vendorSku.CategoryName} skuName.VendorCatIDList = []string{appFood.CategoryName}
if vendorSku.SecondaryCategoryName != "" { if appFood.SecondaryCategoryName != "" {
skuName.VendorCatIDList = append(skuName.VendorCatIDList, vendorSku.SecondaryCategoryName) skuName.VendorCatIDList = append(skuName.VendorCatIDList, appFood.SecondaryCategoryName)
} }
} }
return skuName return skuName
} }
func vendorSkuList2Jx(vendorSkuList []*mtwmapi.AppFood) (skuNameList []*partner.SkuNameInfo) { func vendorSkuList2Jx(appFoodList []*mtwmapi.AppFood) (skuNameList []*partner.SkuNameInfo) {
for _, vendorSku := range vendorSkuList { for _, appFood := range appFoodList {
skuNameList = append(skuNameList, vendorSku2Jx(vendorSku)) skuNameList = append(skuNameList, vendorSku2Jx(appFood))
} }
return skuNameList return skuNameList
} }