diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 66a3fecbd..44e1a6abe 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -2272,8 +2272,37 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID skuName.Skus[0].SpecUnit = productInfo.SpecUnit } } + //难受呀 if len(productInfo.ImgList) > 0 { - skuName.Img = productInfo.ImgList[0] + switch len(productInfo.ImgList) { + case 0: + case 1: + skuName.Img = productInfo.ImgList[0] + case 2: + skuName.Img = productInfo.ImgList[0] + skuName.Img2 = productInfo.ImgList[1] + case 3: + skuName.Img = productInfo.ImgList[0] + skuName.Img2 = productInfo.ImgList[1] + skuName.Img3 = productInfo.ImgList[2] + case 4: + skuName.Img = productInfo.ImgList[0] + skuName.Img2 = productInfo.ImgList[1] + skuName.Img3 = productInfo.ImgList[2] + skuName.Img4 = productInfo.ImgList[3] + case 5: + skuName.Img = productInfo.ImgList[0] + skuName.Img2 = productInfo.ImgList[1] + skuName.Img3 = productInfo.ImgList[2] + skuName.Img4 = productInfo.ImgList[3] + skuName.Img5 = productInfo.ImgList[4] + default: + skuName.Img = productInfo.ImgList[0] + skuName.Img2 = productInfo.ImgList[1] + skuName.Img3 = productInfo.ImgList[2] + skuName.Img4 = productInfo.ImgList[3] + skuName.Img5 = productInfo.ImgList[4] + } } else { skuName.Img = model.NOSkuNameImg } @@ -2310,24 +2339,33 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID if result != nil { imgs := strings.Split(result.Pic, ",") switch len(imgs) { + case 0: case 1: skuName.Img = imgs[0] case 2: - case 3: - case 4: - case 5: - } - if len(imgs) == 1 { - skuName.Img = imgs[0] - } - if len(imgs) == 2 { skuName.Img = imgs[0] skuName.Img2 = imgs[1] - } - if len(imgs) == 3 { + case 3: skuName.Img = imgs[0] skuName.Img2 = imgs[1] skuName.Img3 = imgs[2] + case 4: + skuName.Img = imgs[0] + skuName.Img2 = imgs[1] + skuName.Img3 = imgs[2] + skuName.Img4 = imgs[3] + case 5: + skuName.Img = imgs[0] + skuName.Img2 = imgs[1] + skuName.Img3 = imgs[2] + skuName.Img4 = imgs[3] + skuName.Img5 = imgs[4] + default: + skuName.Img = imgs[0] + skuName.Img2 = imgs[1] + skuName.Img3 = imgs[2] + skuName.Img4 = imgs[3] + skuName.Img5 = imgs[4] } } } diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index 8ebefd2d3..05fdb3e39 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -440,7 +440,7 @@ func RefreshStoreManageState(ctx *jxcontext.Context) { }, deleteList) tasksch.HandleTask(task2, task, true).Run() task2.GetResult(0) - task3 := tasksch.NewParallelTask("createList", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + task3 := tasksch.NewParallelTask("createList", tasksch.NewParallelConfig().SetParallelCount(20).SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeMap := batchItemList[0].(*model.StoreMap) if storeMap.VendorOrgCode == "" || storeMap.VendorStoreID == "" { diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 8b70405e3..a846e0ea8 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -109,6 +109,8 @@ type StoreSkuSyncInfo struct { Img string Img2 string Img3 string + Img4 string + Img5 string DescImg string ImgWatermark string `json:"imgWatermark"` //图片水印 ImgMix string //合成水印后的图片 @@ -457,6 +459,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo IF(t11.%s <> '', t11.%s, t3.img) img, IF(t12.%s <> '', t12.%s, t3.img2) img2, IF(t15.%s <> '', t15.%s, t3.img3) img3, + IF(t20.%s <> '', t20.%s, t3.img4) img4, + IF(t21.%s <> '', t21.%s, t3.img5) img5, IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img, t4.%s_category_id vendor_vendor_cat_id, t4.name category_name, @@ -496,6 +500,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo LEFT JOIN data_resource t11 ON t11.main_url = t3.img LEFT JOIN data_resource t12 ON t12.main_url = t3.img2 LEFT JOIN data_resource t15 ON t15.main_url = t3.img3 + LEFT JOIN data_resource t20 ON t20.main_url = t3.img4 + LEFT JOIN data_resource t21 ON t21.main_url = t3.img5 LEFT JOIN data_resource t13 ON t13.main_url = t3.desc_img LEFT JOIN sku_exinfo_map tsu ON tsu.name_id = t3.id AND tsu.deleted_at = ? AND tsu.vendor_id = t14.vendor_id LEFT JOIN sku_vendor_category_map tsu1 ON tsu1.name_id = t3.id AND tsu1.deleted_at = ? AND tsu1.vendor_id = t14.vendor_id diff --git a/business/partner/purchase/ebai/store_sku2.go b/business/partner/purchase/ebai/store_sku2.go index f713661e2..39f31351e 100644 --- a/business/partner/purchase/ebai/store_sku2.go +++ b/business/partner/purchase/ebai/store_sku2.go @@ -420,6 +420,18 @@ func genSkuParamsFromStoreSkuInfo2(storeSku *dao.StoreSkuSyncInfo, isCreate, isE "url": storeSku.Img3, }) } + if storeSku.Img4 != "" { + photos = append(photos, map[string]interface{}{ + "is_master": false, + "url": storeSku.Img4, + }) + } + if storeSku.Img5 != "" { + photos = append(photos, map[string]interface{}{ + "is_master": false, + "url": storeSku.Img5, + }) + } params = map[string]interface{}{ // "name": utils.LimitMixedStringLen(storeSku.SkuName, ebaiapi.MaxSkuNameByteCount), "left_num": model.MaxStoreSkuStockQty, diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index 8cd8043cb..60d9399e3 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -172,9 +172,9 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd param.ShopCategories = append(param.ShopCategories, utils.Str2Int64(sku.VendorCatID)) } if sku.ImgMix != "" { - param.Images = jxutils.BatchString2Slice(sku.ImgMix, sku.Img2, sku.Img3) + param.Images = jxutils.BatchString2Slice(sku.ImgMix, sku.Img2, sku.Img3, sku.Img4, sku.Img5) } else { - param.Images = jxutils.BatchString2Slice(sku.Img, sku.Img2, sku.Img3) + param.Images = jxutils.BatchString2Slice(sku.Img, sku.Img2, sku.Img3, sku.Img4, sku.Img5) } if param.CategoryID == 0 { diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 24a711ef6..98cd4d301 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -286,13 +286,25 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI foodData["is_sold_out"] = skuStatusJX2Mtwm(storeSku.MergedStatus) if true { // vendorStoreID == specialStoreID { img2 := storeSku.Img2 + img3 := storeSku.Img3 + img4 := storeSku.Img4 + img5 := storeSku.Img5 if img2 == "" { img2 = storeSku.Img } + if img3 == "" { + img3 = storeSku.Img + } + if img4 == "" { + img4 = storeSku.Img + } + if img5 == "" { + img5 = storeSku.Img + } if storeSku.ImgMix != "" && ((storeSku.BrandID == storeSku.ExBrandID && storeSku.ExBrandID != 0) || storeSku.ExBrandID == 0) { - foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.ImgMix, img2, storeSku.ImgMix, storeSku.ImgMix, storeSku.ImgMix), ",") + foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.ImgMix, img2, img3, img4, img5), ",") } else { - foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.Img, img2, storeSku.Img, storeSku.Img, storeSku.Img), ",") + foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.Img, img2, img3, img4, img5), ",") } } else { foodData["picture"] = strings.Join(jxutils.BatchString2Slice(storeSku.Img, storeSku.Img2), ",")