liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into su

Browse Source
This commit is contained in:
苏尹岚
2020-01-14 16:01:30 +08:00
parent 4a7702e177 a643a324d2
commit 75d1bfa503
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/sync.go
View File

@@ -206,7 +206,7 @@ func (v *VendorSync) SyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB
// if !globals.IsUseThingMap { // if !globals.IsUseThingMap {
// return v.oldSyncReorderCategories(ctx, db, categoryID, isAsync, userName) // 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) { // func (v *VendorSync) oldSyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int, isAsync bool, userName string) (hint string, err error) {
@@ -637,7 +637,8 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
if ctx.GetUserName() != "jxadmin" { if ctx.GetUserName() != "jxadmin" {
if len(task.GetFailedList()) > 10 { if len(task.GetFailedList()) > 10 {
downloadURL, _, _ := WirteToExcelBySyncFailed(task) 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 { } else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 {
if task.GetErr() != nil { if task.GetErr() != nil {
noticeMsg = utils.Format4Output(buildErrMsgJson(task), true) noticeMsg = utils.Format4Output(buildErrMsgJson(task), true)

2
business/partner/purchase/jd/sku2.go
View File

@@ -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) { func (p *PurchaseHandler) ReorderCategories2(ctx *jxcontext.Context, vendorOrgCode, vendorParentCatID string, vendorCatIDList []string) (err error) {
if globals.EnableJdStoreWrite { 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 return err
} }