diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index bad97e074..bef89ed5c 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -69,7 +69,7 @@ type StoreSkuSyncInfo struct { // 平台相关的图片信息 Img string Img2 string - DescImg string // 饿百是SkuName中的DescImgEbai + DescImg string VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类(叶子结点) diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index 09f02f0b3..a90ee8274 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -6,13 +6,13 @@ import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" - "git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego" ) @@ -167,6 +167,10 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd Upc: sku.Upc, Images: jxutils.BatchString2Slice(sku.Img, sku.Img2), } + // 不为份的SKU,如果没有设置upc,自动生成一个假的 + // if sku.Unit != model.SpecialUnit && param.Upc == "" { + // param.Upc = jxutils.GenFakeUPC(sku.SkuID) + // } if param.CategoryID == 0 { param.CategoryID = int64(getDefJdCategoryID()) } diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index a54934195..6c52ec66a 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -284,7 +284,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI skus[0]["price"] = foodData["price"] } skus[0]["stock"] = stockCount2Mtwm(model.MaxStoreSkuStockQty) - skus[0]["upc"] = storeSku.Upc + if storeSku.Upc != "" { + skus[0]["upc"] = storeSku.Upc + } if foodData["tag_id"] != nil { skus[0]["weight"] = storeSku.Weight // weight字段仅限服饰鞋帽、美妆、日用品、母婴、生鲜果蔬、生活超市下的便利店/超市门店品类的商家使用 }