diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 61a09669b..346ca1a4f 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -348,13 +348,20 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s return "", err } dao.Commit(db) + vendorStoreMap := make(map[int][]int) for _, v := range storeMapList { - if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{ - model.FieldStoreID: v.StoreID, - }, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil { - return "", err - } + vendorStoreMap[v.VendorID] = append(vendorStoreMap[v.VendorID], v.StoreID) } + for vendorID, storeIDs := range vendorStoreMap { + dao.SetStoreSkuSyncStatus(db, vendorID, storeIDs, nil, model.SyncFlagPriceMask) + } + // for _, v := range storeMapList { + // if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{ + // model.FieldStoreID: v.StoreID, + // }, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil { + // return "", err + // } + // } case model.ConfigTypeFreightPack: dao.Commit(db) storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "") diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index d61410ad5..1b0b9be91 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -380,9 +380,9 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int ` fmtParams = append(fmtParams, fieldPrefix) } - sql += " WHERE (t1.deleted_at = ?)" - // fmtParams = append(fmtParams, fieldPrefix) - sqlParams = append(sqlParams, utils.DefaultTimeValue) + sql += " WHERE t1.deleted_at = ? AND t1.%s_sync_status & ? = 0" + fmtParams = append(fmtParams, fieldPrefix) + sqlParams = append(sqlParams, utils.DefaultTimeValue, model.SyncFlagDeletedMask) if len(storeIDs) > 0 { sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")" sqlParams = append(sqlParams, storeIDs)