diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 0a79b3af9..334ccf71c 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -544,33 +544,35 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s skuNameExt.SpecQuality = skuNameExt.Skus[0].SpecQuality skuNameExt.SpecUnit = skuNameExt.Skus[0].SpecUnit } - imgContent, imgMD5, err := jxutils.DownloadFileByURL(skuNameExt.Img) - if err != nil { - dao.Rollback(db) - return nil, err - } - if skuNameExt.ImgHashCode == "" { - skuNameExt.ImgHashCode = imgMD5 - } else if skuNameExt.ImgHashCode != imgMD5 { - dao.Rollback(db) - return nil, errors.New("图片HASH值不同") - } - imgHintMap, err := UploadImg2Platforms(ctx, nil, skuNameExt.Img, imgContent, "") - if err != nil { - dao.Rollback(db) - return nil, err - } - skuNameExt.ImgWeimob = imgHintMap[model.VendorIDWSC] - skuNameExt.ImgEbai = imgHintMap[model.VendorIDEBAI] - if skuNameExt.DescImg != "" && getAndSetEbaiUploadRTFShopID() != "" { - skuNameExt.DescImgEbai, err = api.EbaiAPI.SkuUploadRTF(getAndSetEbaiUploadRTFShopID(), ebaiapi.BuildRFTFromImgs(skuNameExt.DescImg)) - } - if err != nil { - dao.Rollback(db) - return nil, err - } + if globals.EnableStoreWrite { + imgContent, imgMD5, err := jxutils.DownloadFileByURL(skuNameExt.Img) + if err != nil { + dao.Rollback(db) + return nil, err + } + if skuNameExt.ImgHashCode == "" { + skuNameExt.ImgHashCode = imgMD5 + } else if skuNameExt.ImgHashCode != imgMD5 { + dao.Rollback(db) + return nil, errors.New("图片HASH值不同") + } + imgHintMap, err := UploadImg2Platforms(ctx, nil, skuNameExt.Img, imgContent, "") + if err != nil { + dao.Rollback(db) + return nil, err + } + skuNameExt.ImgWeimob = imgHintMap[model.VendorIDWSC] + skuNameExt.ImgEbai = imgHintMap[model.VendorIDEBAI] + if skuNameExt.DescImg != "" && getAndSetEbaiUploadRTFShopID() != "" { + skuNameExt.DescImgEbai, err = api.EbaiAPI.SkuUploadRTF(getAndSetEbaiUploadRTFShopID(), ebaiapi.BuildRFTFromImgs(skuNameExt.DescImg)) + } + if err != nil { + dao.Rollback(db) + return nil, err + } + } if err = dao.CreateEntity(db, &skuNameExt.SkuName); err != nil { dao.Rollback(db) return nil, err @@ -642,32 +644,34 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf } err = nil } - if valid["img"] != nil { - imgContent, imgMD5, err2 := jxutils.DownloadFileByURL(valid["img"].(string)) - if err = err2; err != nil { - return 0, err - } - valid["ImgHashCode"] = imgMD5 - imgHintMap, err := UploadImg2Platforms(ctx, nil, valid["img"].(string), imgContent, "") - if err != nil { - dao.Rollback(db) - return 0, err - } - valid["ImgWeimob"] = imgHintMap[model.VendorIDWSC] - valid["ImgEbai"] = imgHintMap[model.VendorIDEBAI] - } - if valid["descImg"] != nil { - descImg := valid["descImg"].(string) - if descImg != "" { - if getAndSetEbaiUploadRTFShopID() != "" { - valid["descImgEbai"], err = api.EbaiAPI.SkuUploadRTF(getAndSetEbaiUploadRTFShopID(), ebaiapi.BuildRFTFromImgs(descImg)) - if err != nil { - dao.Rollback(db) - return 0, err - } + if globals.EnableStoreWrite { + if valid["img"] != nil { + imgContent, imgMD5, err2 := jxutils.DownloadFileByURL(valid["img"].(string)) + if err = err2; err != nil { + return 0, err + } + valid["ImgHashCode"] = imgMD5 + imgHintMap, err := UploadImg2Platforms(ctx, nil, valid["img"].(string), imgContent, "") + if err != nil { + dao.Rollback(db) + return 0, err + } + valid["ImgWeimob"] = imgHintMap[model.VendorIDWSC] + valid["ImgEbai"] = imgHintMap[model.VendorIDEBAI] + } + if valid["descImg"] != nil { + descImg := valid["descImg"].(string) + if descImg != "" { + if getAndSetEbaiUploadRTFShopID() != "" { + valid["descImgEbai"], err = api.EbaiAPI.SkuUploadRTF(getAndSetEbaiUploadRTFShopID(), ebaiapi.BuildRFTFromImgs(descImg)) + if err != nil { + dao.Rollback(db) + return 0, err + } + } + } else { + valid["descImgEbai"] = "" } - } else { - valid["descImgEbai"] = "" } } if num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, skuName, valid, userName, nil, model.FieldJdSyncStatus, model.SyncFlagModifiedMask); err == nil && num == 1 { diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 90400fd2d..950a8133d 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -59,6 +59,14 @@ var ( ErrCanNotFindVendor = errors.New("vendorID参数不合法") ) +var ( + dadaDistrictMap = map[string]string{ + "苏州工业园区": "工业园区", + "郫都区": "郫县", + "管城回族区": "管城区", + } +) + // todo 门店绑定信息可以考虑以数组形式返回,而不是现在这样 func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interface{}, offset, pageSize int) (retVal *StoresInfo, err error) { sql := ` @@ -934,8 +942,8 @@ func updateOrCreateDadaStore(storeDetail *dao.StoreDetail2) (err error) { if storeDetail.CityName == "" { return fmt.Errorf("门店的城市码有问题,请检查") } - if storeDetail.DistrictName == "郫都区" { - storeDetail.DistrictName = "郫县" + if dadaDistrictMap[storeDetail.DistrictName] != "" { + storeDetail.DistrictName = dadaDistrictMap[storeDetail.DistrictName] } if globals.EnableStoreWrite { _, err = api.DadaAPI.ShopDetail(storeDetail.DadaStoreID)