Merge remote-tracking branch 'origin/mark' into yonghui

2019-12-13 16:55:10 +08:00
parent ebad9c1290 032bb05157
commit 3412f95380
2 changed files with 53 additions and 51 deletions
--- a/business/partner/purchase/jd/sku2.go
+++ b/business/partner/purchase/jd/sku2.go
@@ -168,9 +168,9 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd
 		Images: jxutils.BatchString2Slice(sku.Img, sku.Img2),
 	}
 	// 不为份的SKU，如果没有设置upc，自动生成一个假的
-	// if sku.Unit != model.SpecialUnit && param.Upc == "" {
-	// 	param.Upc = jxutils.GenFakeUPC(sku.SkuID)
-	// }
+	if sku.Unit != model.SpecialUnit && param.Upc == "" {
+		param.Upc = jxutils.GenFakeUPC(sku.SkuID)
+	}
 	if param.CategoryID == 0 {
 		param.CategoryID = int64(getDefJdCategoryID())
 	}