From 571b40022923df427072e0596245f02728cfea5b Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 14 Jan 2020 14:36:19 +0800 Subject: [PATCH 1/3] fix bug in SyncReorderCategories --- business/jxstore/cms/sync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 14a7128ea..1643e6d4f 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -206,7 +206,7 @@ func (v *VendorSync) SyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB // if !globals.IsUseThingMap { // return v.oldSyncReorderCategories(ctx, db, categoryID, isAsync, userName) // } - return SyncReorderCategories(ctx, -1, isAsync) + return SyncReorderCategories(ctx, categoryID, isAsync) } // func (v *VendorSync) oldSyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) { From aad6c2c9b634d96f52c42f0055caf9a936318c28 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 14 Jan 2020 14:43:23 +0800 Subject: [PATCH 2/3] jdapi.ReorderCategories2 --- business/partner/purchase/jd/sku2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/jd/sku2.go b/business/partner/purchase/jd/sku2.go index 147525810..5d2717984 100644 --- a/business/partner/purchase/jd/sku2.go +++ b/business/partner/purchase/jd/sku2.go @@ -107,7 +107,7 @@ func (p *PurchaseHandler) DeleteCategory2(ctx *jxcontext.Context, vendorOrgCode, func (p *PurchaseHandler) ReorderCategories2(ctx *jxcontext.Context, vendorOrgCode, vendorParentCatID string, vendorCatIDList []string) (err error) { if globals.EnableJdStoreWrite { - err = getAPI(vendorOrgCode).ChangeShopCategoryOrder(utils.Str2Int64(vendorParentCatID), utils.StringSlice2Int64(vendorCatIDList)) + err = getAPI(vendorOrgCode).ChangeShopCategoryOrder(utils.Str2Int64WithDefault(vendorParentCatID, 0), utils.StringSlice2Int64(vendorCatIDList)) } return err } From 9786fe16ba4532af12d59726398be0299f654b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 14 Jan 2020 15:41:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=B6=85=E8=BF=8710=E8=A1=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9Eexcel=E7=9A=84=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sync.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 1643e6d4f..86e61317d 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -637,7 +637,8 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I if ctx.GetUserName() != "jxadmin" { if len(task.GetFailedList()) > 10 { downloadURL, _, _ := WirteToExcelBySyncFailed(task) - noticeMsg = fmt.Sprintf("[详情点我]path1=%s\n", downloadURL) + noticeMsg = "您此次的同步任务错误详情返回如下：" + noticeMsg += fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s \n", globals.BackstageHost, downloadURL) } else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 { if task.GetErr() != nil { noticeMsg = utils.Format4Output(buildErrMsgJson(task), true)