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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-04-02 11:03:01 +08:00
parent 0a92b20480
commit 8429a5a27c
16 changed files with 267 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1045,12 +1045,12 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
dao.Rollback(db, txDB)
return 0, err
}
if valid["jdsStockSwitch"] != nil {
if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil {
dao.Rollback(db, txDB)
return 0, err
}
}
// if valid["jdsStockSwitch"] != nil {
// if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil {
// dao.Rollback(db, txDB)
// return 0, err
// }
// }
}
dao.Commit(db, txDB)

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

@@ -1168,7 +1168,7 @@ func SyncJdsStoreStock(ctx *jxcontext.Context, isAsync, isContinueWhenError bool
storeMaps []*model.StoreMap
)
sql := `
SELECT * FROM store_map WHERE vendor_id = ? AND vendor_store_id <> '' AND store_id <> ? AND vendor_org_code = 1
SELECT * FROM store_map WHERE vendor_id = ? AND vendor_store_id <> '' AND store_id <> ? AND vendor_org_code = 2
`
sqlParams := []interface{}{
model.VendorIDJDShop, model.JdShopMainStoreID,

4
business/jxstore/cms/sync_store_sku.go
View File

@@ -72,7 +72,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
num := 0
db := dao.GetDB()
if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil {
api.JdShop2API.SetCookieWithStr(configs[0].Value)
api.JdShopAPI.SetCookieWithStr(configs[0].Value)
}
rootTask := tasksch.NewSeqTask(fmt.Sprintf("%s SyncStoreCategory step1", model.VendorChineseNames[vendorID]), ctx,
func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
@@ -935,7 +935,7 @@ func amendAndPruneStoreStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, v
for _, v := range localSkuList {
vendorSkuID := v.VendorSkuID
if vendorID == model.VendorIDJDShop {
if storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID2}, []int{v.SkuID}); len(storeSkus) > 0 {
if storeSkus, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, []int{v.SkuID}); len(storeSkus) > 0 {
vendorSkuID = utils.Int64ToStr(storeSkus[0].JdsID)
}
}