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

Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

Browse Source
This commit is contained in:
gazebo
2019-09-02 14:04:48 +08:00
parent 3d21ffaf11 6c8ab5cc6c
commit f0d8582b12
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/jxstore/cms/sku.go
View File

@@ -1075,33 +1075,23 @@ func SortCategorySkus(ctx *jxcontext.Context, catID int, skuIDList []int) (err e
nameIDList := []int{}
for _, value := range skuList {
seq := skuIDMap[value.ID]
kvs := map[string]interface{}{
model.FieldSkuSeq: seq,
//model.FieldJdSyncStatus: (value.JdSyncStatus | model.SyncFlagModifiedMask),
if value.Seq != seq {
kvs := map[string]interface{}{
model.FieldSkuSeq: seq,
//model.FieldJdSyncStatus: (value.JdSyncStatus | model.SyncFlagModifiedMask),
}
dao.UpdateEntityLogically(db, value, kvs, userName, nil)
nameIDList = append(nameIDList, value.NameID)
}
dao.UpdateEntityLogically(db, value, kvs, userName, nil)
nameIDList = append(nameIDList, value.NameID)
}
//_, err = CurVendorSync.SyncSkus(ctx, db, nameIDList, []int{}, false, false, userName)
if err == nil {
if err == nil && len(nameIDList) > 0 {
dao.Commit(db)
skuIDs, err2 := dao.GetSkuIDByNames(db, nameIDList)
if err = err2; err == nil && len(skuIDs) > 0 {
_, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask)
}
// taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
// switch step {
// case 0:
// skuIDs, err2 := dao.GetSkuIDByNames(db, nameIDList)
// if err = err2; err == nil && len(skuIDs) > 0 {
// _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask)
// }
// }
// return result, err
// }
// taskSeq := tasksch.NewSeqTask("SortCategorySku", ctx, taskSeqFunc, 1)
// taskSeq.Run()
} else {
dao.Rollback(db)
}

2
business/jxstore/misc/misc2.go
View File

@@ -17,7 +17,7 @@ import (
)
const (
enableScheduleRefreshStore = false
enableScheduleRefreshStore = true
taskParallelCount = 4
specialSkuNameKeyWord = "温馨提示"
startOpStoreStockNumber = 0