diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index b75c198be..4e458a63f 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -725,7 +725,7 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store case 0: _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) case 1: - //_, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) + _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) case 2: _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) } diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index b1c07a568..c1293de69 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -2,10 +2,6 @@ package jd import ( "fmt" - "git.rosy.net.cn/jx-callback/globals/api/apimanager" - beego "github.com/astaxie/beego/server/web" - "strings" - "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -15,6 +11,9 @@ import ( "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/apimanager" + beego "github.com/astaxie/beego/server/web" + "strings" //beego "github.com/astaxie/beego/server/web" ) @@ -162,6 +161,7 @@ func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCat } func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jdapi.OpSkuParam) { + db := dao.GetDB() param = &jdapi.OpSkuParam{ TraceID: ctx.GetTrackInfo(), OutSkuID: utils.Int2Str(sku.SkuID), @@ -185,19 +185,24 @@ func skuInfo2Param(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (param *jd param.Images = jxutils.BatchString2Slice(sku.Img, sku.Img2, sku.Img3, sku.Img4, sku.Img5) } + switch sku.NameID { + case 8080661, 8080665, 8080667, 8080670: + globals.SugarLogger.Debugf("--------sku := %s", utils.Format4Output(sku, false)) + } + if sku.SkuVendorMapCatID != "" && sku.SkuVendorMapCatID != "0" { param.CategoryID = utils.Str2Int64(sku.SkuVendorMapCatID) } else if sku.VendorVendorCatID != 0 { param.CategoryID = sku.VendorVendorCatID - dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_vendor_category_map SET vendor_category_id = ? WHERE name_id = ? AND vendor_id = ? `, []interface{}{sku.VendorVendorCatID, sku.NameID, sku.VendorID}...) - dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_name SET jd_category_id = ? WHERE id = ? `, []interface{}{sku.VendorVendorCatID, sku.NameID}) + dao.ExecuteSQL(db, ` UPDATE sku_vendor_category_map SET vendor_category_id = ? WHERE name_id = ? AND vendor_id = ? `, []interface{}{sku.VendorVendorCatID, sku.NameID, sku.VendorID}...) + //dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_name SET jd_category_id = ? WHERE id = ? `, []interface{}{sku.VendorVendorCatID, sku.NameID}) } else { recommendCategory, _ := getAPI(sku.VendorOrgCode).GetSkuCategoryBySkuName(param.SkuName) if recommendCategory != nil && recommendCategory.CategoryId != model.NO { param.CategoryID = int64(recommendCategory.CategoryId) - dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_vendor_category_map SET vendor_category_id = ? WHERE name_id = ? AND vendor_id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID, sku.VendorID}...) + dao.ExecuteSQL(db, ` UPDATE sku_vendor_category_map SET vendor_category_id = ? WHERE name_id = ? AND vendor_id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID, sku.VendorID}...) //dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_category SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.LocalCategoryId}...) - dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_name SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID}) + //dao.ExecuteSQL(dao.GetDB(), ` UPDATE sku_name SET jd_category_id = ? WHERE id = ? `, []interface{}{recommendCategory.CategoryId, sku.NameID}) } }