From fcb37966e947ac7e12be22272169c52ae01a498e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 21 Feb 2020 14:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eebai2API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 176 ++++++++++++++++++------------------ conf/app.conf | 2 + globals/api/api.go | 15 ++- 3 files changed, 103 insertions(+), 90 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index c058396f4..f0f19cb45 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1482,92 +1482,92 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) switch step { case 0: taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - v := batchItemList[0].(*ebaiapi.ExianDaSkus) - skus, err := api.EbaiAPI.GetExianDaSku(utils.Str2Int64(v.ElemeGoodsID)) - if err != nil { - return result, err - } - skuNameExt := &model.SkuName{} - sql2 := ` - SELECT a.* - FROM sku_name a - JOIN sku b ON b.name_id = a.id - WHERE a.upc = ? - ` - sqlParams2 := []interface{}{ - skus.UpcIds, - } - dao.GetRow(db, skuNameExt, sql2, sqlParams2) - prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName) - //京西库中存在此商品 - if skuNameExt.ID != 0 { - var flag = false - if skuNameExt.Name != v.GoodsName { - skuNameExt.Name = v.GoodsName - skuNameExt.Prefix = prefix - skuNameExt.SpecUnit = specUnit - skuNameExt.Unit = unit - skuNameExt.SpecQuality = specQuality - flag = true - } - if skuNameExt.Img != v.ImageURL { - skuNameExt.Img = v.ImageURL - flag = true - } - if flag { - _, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img") - if err != nil { - return result, err - } - } - } else { - skuCat := &model.SkuCategory{} - sql := ` - SELECT * - FROM sku_category - WHERE ebai_category_id = ? - ` - sqlParams := []interface{}{ - skus.CategoryIDThird, - } - dao.GetRow(db, skuCat, sql, sqlParams) - skuName := &model.SkuName{ - Prefix: prefix, - Name: v.GoodsName, - IsGlobal: model.YES, - Unit: unit, - SpecQuality: specQuality, - SpecUnit: specUnit, - Price: 100, - Img: v.ImageURL, - Upc: &v.UpcID, - Status: model.SkuStatusNormal, - } - if skuCat.ID != 0 { - skuName.CategoryID = skuCat.ID - } else { - skuName.CategoryID = 35 //默认给了个分类 - } - dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName()) - err = dao.CreateEntity(db, skuName) - if err != nil { - return result, err - } - sku := &model.Sku{ - NameID: skuName.ID, - SpecQuality: specQuality, - SpecUnit: specUnit, - Weight: int(utils.Str2Int64(skus.Weight)), - Status: model.SkuStatusNormal, - ExdSkuID: v.ElemeGoodsID, - ExdCategoryThirdID: skus.CategoryIDThird, - } - dao.WrapAddIDCULDEntity(sku, ctx.GetUserName()) - err = dao.CreateEntity(db, sku) - if err != nil { - return result, err - } - } + // v := batchItemList[0].(*ebaiapi.ExianDaSkus) + // skus, err := api.EbaiAPI.GetExianDaSku(utils.Str2Int64(v.ElemeGoodsID)) + // if err != nil { + // return result, err + // } + // skuNameExt := &model.SkuName{} + // sql2 := ` + // SELECT a.* + // FROM sku_name a + // JOIN sku b ON b.name_id = a.id + // WHERE a.upc = ? + // ` + // sqlParams2 := []interface{}{ + // skus.UpcIds, + // } + // dao.GetRow(db, skuNameExt, sql2, sqlParams2) + // prefix, _, _, specUnit, unit, specQuality := jxutils.SplitSkuName(v.GoodsName) + // //京西库中存在此商品 + // if skuNameExt.ID != 0 { + // var flag = false + // if skuNameExt.Name != v.GoodsName { + // skuNameExt.Name = v.GoodsName + // skuNameExt.Prefix = prefix + // skuNameExt.SpecUnit = specUnit + // skuNameExt.Unit = unit + // skuNameExt.SpecQuality = specQuality + // flag = true + // } + // if skuNameExt.Img != v.ImageURL { + // skuNameExt.Img = v.ImageURL + // flag = true + // } + // if flag { + // _, err = dao.UpdateEntity(db, skuNameExt, "Name", "Prefix", "SpecUnit", "Unit", "SpecQuality", "Img") + // if err != nil { + // return result, err + // } + // } + // } else { + // skuCat := &model.SkuCategory{} + // sql := ` + // SELECT * + // FROM sku_category + // WHERE ebai_category_id = ? + // ` + // sqlParams := []interface{}{ + // skus.CategoryIDThird, + // } + // dao.GetRow(db, skuCat, sql, sqlParams) + // skuName := &model.SkuName{ + // Prefix: prefix, + // Name: v.GoodsName, + // IsGlobal: model.YES, + // Unit: unit, + // SpecQuality: specQuality, + // SpecUnit: specUnit, + // Price: 100, + // Img: v.ImageURL, + // Upc: &v.UpcID, + // Status: model.SkuStatusNormal, + // } + // if skuCat.ID != 0 { + // skuName.CategoryID = skuCat.ID + // } else { + // skuName.CategoryID = 35 //默认给了个分类 + // } + // dao.WrapAddIDCULDEntity(skuName, ctx.GetUserName()) + // err = dao.CreateEntity(db, skuName) + // if err != nil { + // return result, err + // } + // sku := &model.Sku{ + // NameID: skuName.ID, + // SpecQuality: specQuality, + // SpecUnit: specUnit, + // Weight: int(utils.Str2Int64(skus.Weight)), + // Status: model.SkuStatusNormal, + // ExdSkuID: v.ElemeGoodsID, + // ExdCategoryThirdID: skus.CategoryIDThird, + // } + // dao.WrapAddIDCULDEntity(sku, ctx.GetUserName()) + // err = dao.CreateEntity(db, sku) + // if err != nil { + // return result, err + // } + // } return retVal, err } taskParallel := tasksch.NewParallelTask("更新京西上饿鲜达商品库", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, results) @@ -1591,11 +1591,11 @@ func SumExianDaDepot(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) err = dao.GetRows(db, &skus, sql, sqlParams...) taskFunc2 := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { v := batchItemList[0].(*model.SkuName) - skuList, err := api.EbaiAPI.GetEbaiDepotSku(ebaiapi.EbaiWholeCountryStore, *v.Upc) + skuList, err := api.Ebai2API.GetEbaiDepotSku(ebaiapi.EbaiWholeCountryStore, *v.Upc) if err != nil || len(skuList) == 0 { return retVal, err } - sku, err := api.EbaiAPI.GetEbaiSku(skuList[0].UpcID, ebaiapi.EbaiWholeCountryStore) + sku, err := api.Ebai2API.GetEbaiSku(skuList[0].UpcID, ebaiapi.EbaiWholeCountryStore) if err != nil || sku == nil { return retVal, err } diff --git a/conf/app.conf b/conf/app.conf index d94eed62d..25696cfc0 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -66,6 +66,8 @@ fakeJdBaseURL = "http://test.jxc4.com/qqqq" ebaiStorePageCookieWMUSS = "B0AAFQCAAAGbhkuMCsvcyYBDkkyAxBGIBlgXAQYVwc7VwYZFkx2HDoPSmo5eV1femopWgJRawhgAALG04cg1RUmhUakBbJRdgPS0tNEhnQhNRewwuWwYYBDEFPCQSDXV5YWA6PAVRHUJ9SnVGMThYAjNjLw9pRxIbS04-XFo05AQgBl%7ERLA33vWcR73gEAKZ" ebaiStorePageCookieWMSTOKEN = "gAALgNAAAGfBI5YEBHSQdZY1InIS8CVQU9aBU1f3VLWVQqKHAAAc5LnRLZ1QLLx0S5IuzCSX8ZQ7oUwAAUr-GEm9JpRc9AQAAsLkLHHXzuhh2lZkbyrcAAAWBESKg3ZA" +ebaiStorePageCookieWMUSS2 = "4AAPQCAAB5PF0aUGcBVzoRTCEkOFhFIhx-Yk9vN2EfPHYoLlROKBEsQmAUQjhNUgRt0ADAP5x-RFklwAAdjxGO11iOj8xKXYSSDIJb2BcPghsaklNfQwGS10JOVRFfhAiYElhEXFXIzoJKyloCGdwdFE6Qk9FRxojUFN3FVEHNjJPZJu4Bt9nxQ13cwoMbjA" +ebaiStorePageCookieWMSTOKEN2 = "AcAANQZAABbC04rUBZFc2UYanlocDAaP0dcfzZCeS1SHQ1qJ15ExgAA13A2dGLjdbcitBZJu4Bn6B_g6cZAAA0tyyFm8cdBaNAQAAwug8HTG0xRjwt1UZzbcAAN7ofRO" ebaiStorePageCookieExdTOKEN = "PBE_2.0_5cd1c6141c127d419e817e88920aa5ae01c164ed47b678e0b16c628ef65ffc0b93ddf4a7cd1f7172e644f4f5321c5f197dd406a5a0d219aae2fa169e59c5419db8f4d4ca44c01e112c6bb4f8d87cbae90e6eaefceba88f486f26bafa41f3ec181773c4b329a6c7c154333a8496509943c63a96c71c72edc82f6beb6ecd9acd5ad69b2f2bbcbe011d05536112cbe52be0b2176860870ce608a0d7f465a1e782f6584e4253aaaee30d9042f82f12b312b5a29151e2e0400f4a128ee365966025f9719278850f60e10ddda0e32554c6867091321cd552b41aa5e5e676f64af218a0e98e4030f499c31de664a0c0a23c5306075ffb061c7654d4646317c8e6a55c66361c96b9e8f11f55c2f666a0240a3f8fb8e221d58b907731a8720572a03febd20d146cad4b6a3821cfd3c5b3286bb3383c4eff8c8ff2d63b8773bbd88f2d6c4b1deb7634221b0e086b7b7d6201435dacdb09525dc59588beeffcd0232ef64aa73fd2325509fa7fc6" mtpsStoreToken = "M0p9VatZSeSHfrosD5IViAVl73IcA8mlcuHIV5sG6Zpv83a7JE0wY3t26aEhrrs_MR5gtLSFF1UIkt8HAjaXow" diff --git a/globals/api/api.go b/globals/api/api.go index cf7608f49..83cd083c2 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -39,8 +39,10 @@ var ( Jd2API *jdapi.API FakeJdAPI *jdapi.API - ElmAPI *elmapi.API - EbaiAPI *ebaiapi.API + ElmAPI *elmapi.API + EbaiAPI *ebaiapi.API + Ebai2API *ebaiapi.API + MtwmAPI *mtwmapi.API MtpsAPI *mtpsapi.API DadaAPI *dadaapi.API @@ -130,8 +132,17 @@ func Init() { EbaiAPI.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN) EbaiAPI.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) } + Ebai2API = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret")) + ebaiStorePageCookieWMUSS2 := beego.AppConfig.DefaultString("ebaiStorePageCookieWMUSS2", "") + ebaiStorePageCookieWMSTOKEN2 := beego.AppConfig.DefaultString("ebaiStorePageCookieWMSTOKEN2", "") + if ebaiStorePageCookieWMUSS2 != "" && ebaiStorePageCookieWMSTOKEN2 != "" && ebaiStorePageCookieExdTOKEN != "" { + Ebai2API.SetCookie("WMUSS", ebaiStorePageCookieWMUSS2) + Ebai2API.SetCookie("WMSTOKEN", ebaiStorePageCookieWMSTOKEN2) + Ebai2API.SetCookie("PASSPORT_DELIMONT_TOKEN", ebaiStorePageCookieExdTOKEN) + } } else { EbaiAPI = nil + Ebai2API = nil } if !beego.AppConfig.DefaultBool("disableMtps", false) {