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

- CopyStoreSkus中，更新已有记录时，不应设置为SyncFlagNewMask状态

Browse Source
This commit is contained in:
gazebo
2019-03-24 10:59:38 +08:00
parent b5135287af
commit 495b241caa
1 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
business/jxstore/cms/store_sku.go
View File

@@ -782,12 +782,11 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
now := time.Now() now := time.Now()
if fromStoreID == toStoreID { if fromStoreID == toStoreID {
// return 0, fmt.Errorf("源门店：%d与目标门店：%d相同", fromStoreID, toStoreID)
sql := ` sql := `
UPDATE store_sku_bind t1 UPDATE store_sku_bind t1
JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ?
JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ?
SET t1.last_operator = ?, SET t1.last_operator = ?,
t1.updated_at = ?, t1.updated_at = ?,
t1.price = t1.price * ? / 100, t1.price = t1.price * ? / 100,
@@ -795,6 +794,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
t1.jd_sync_status = t1.jd_sync_status | ?, t1.jd_sync_status = t1.jd_sync_status | ?,
t1.elm_sync_status = t1.elm_sync_status | ?, t1.elm_sync_status = t1.elm_sync_status | ?,
t1.wsc_sync_status = t1.wsc_sync_status | ?, t1.wsc_sync_status = t1.wsc_sync_status | ?,
t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
t1.ebai_sync_status = t1.ebai_sync_status | ? t1.ebai_sync_status = t1.ebai_sync_status | ?
WHERE t1.store_id = ? AND t1.deleted_at = ? WHERE t1.store_id = ? AND t1.deleted_at = ?
` `
@@ -810,6 +810,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
model.SyncFlagModifiedMask | model.SyncFlagPriceMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagModifiedMask | model.SyncFlagPriceMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagModifiedMask | model.SyncFlagPriceMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
toStoreID, toStoreID,
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }
@@ -826,22 +827,27 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
} }
}() }()
if copyMode == CopyStoreSkuModeFresh || copyMode == CopyStoreSkuModeUpdate { if copyMode == CopyStoreSkuModeFresh || copyMode == CopyStoreSkuModeUpdate {
// 将toStore中存在，但fromStore中不存在的置删除标志
sqlDelete := ` sqlDelete := `
UPDATE store_sku_bind t1 UPDATE store_sku_bind t1
JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ?
JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id AND t2.deleted_at = ?
JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t2.deleted_at = ?
SET t1.deleted_at = ?, SET t1.deleted_at = ?,
t1.updated_at = ?, t1.updated_at = ?,
t1.last_operator = ?, t1.last_operator = ?,
t1.status = ?, t1.status = ?,
t1.jd_sync_status = IF(t1.jd_sync_status = ?, 0, ?), t1.jd_sync_status = IF((t1.jd_sync_status & ?) <> 0, 0, ?),
t1.elm_sync_status = IF(t1.elm_sync_status = ?, 0, ?), t1.elm_sync_status = IF((t1.elm_sync_status & ?) <> 0, 0, ?),
t1.wsc_sync_status = IF(t1.wsc_sync_status = ?, 0, ?), t1.wsc_sync_status = IF((t1.wsc_sync_status & ?) <> 0, 0, ?),
t1.ebai_sync_status = IF(t1.ebai_sync_status = ?, 0, ?) t1.mtwm_sync_status = IF((t1.mtwm_sync_status & ?) <> 0, 0, ?),
WHERE t1.store_id = ? AND t1.deleted_at = ? t1.ebai_sync_status = IF((t1.ebai_sync_status & ?) <> 0, 0, ?)
WHERE t1.store_id = ? AND t1.deleted_at = ? AND t0.id IS NULL
` `
sqlDeleteParams := []interface{}{ sqlDeleteParams := []interface{}{
fromStoreID,
utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
@@ -857,6 +863,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
model.SyncFlagDeletedMask, model.SyncFlagDeletedMask,
model.SyncFlagNewMask, model.SyncFlagNewMask,
model.SyncFlagDeletedMask, model.SyncFlagDeletedMask,
model.SyncFlagNewMask,
model.SyncFlagDeletedMask,
toStoreID, toStoreID,
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }
@@ -865,28 +873,30 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
sqlDeleteParams = append(sqlDeleteParams, sqlCatAndSkuParams) sqlDeleteParams = append(sqlDeleteParams, sqlCatAndSkuParams)
} }
// globals.SugarLogger.Debug(sqlDelete) // globals.SugarLogger.Debug(sqlDelete)
if _, err = dao.ExecuteSQL(db, sqlDelete, sqlDeleteParams); err != nil { if num, err = dao.ExecuteSQL(db, sqlDelete, sqlDeleteParams); err != nil {
return 0, err return 0, err
} }
globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num1:%d", ctx.GetTrackInfo(), num)
} }
// 处理toStore中与fromStore中都存在的
sql := ` sql := `
UPDATE store_sku_bind t1 UPDATE store_sku_bind t1
JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ? JOIN store_sku_bind t0 ON t0.store_id = ? AND t0.sku_id = t1.sku_id AND t0.deleted_at = ?
JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
SET t1.last_operator = ?, SET t1.last_operator = ?,
t1.updated_at = ?, t1.updated_at = ?,
t1.deleted_at = ?,
t1.sub_store_id = 0, t1.sub_store_id = 0,
t1.price = t0.price * ? / 100, t1.price = t0.price * ? / 100,
t1.unit_price = t0.unit_price * ? / 100, t1.unit_price = t0.unit_price * ? / 100,
t1.status = t0.status, t1.status = t0.status,
t1.jd_sync_status = ?, t1.jd_sync_status = t1.jd_sync_status | ?,
t1.elm_sync_status = ?, t1.elm_sync_status = t1.elm_sync_status | ?,
t1.wsc_sync_status = ?, t1.wsc_sync_status = t1.wsc_sync_status | ?,
t1.ebai_sync_status = ? t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
WHERE t1.store_id = ? AND (t1.deleted_at = ? OR t1.deleted_at = ?) t1.ebai_sync_status = t1.ebai_sync_status | ?
WHERE t1.store_id = ? AND t1.deleted_at = ? AND t0.id IS NOT NULL
` `
sqlParams := []interface{}{ sqlParams := []interface{}{
fromStoreID, fromStoreID,
@@ -896,35 +906,34 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
utils.DefaultTimeValue, utils.DefaultTimeValue,
userName, userName,
now, now,
utils.DefaultTimeValue,
pricePercentage, pricePercentage,
pricePercentage, pricePercentage,
model.SyncFlagNewMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagNewMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagNewMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagNewMask, model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
model.SyncFlagModifiedMask | model.SyncFlagPriceMask,
toStoreID, toStoreID,
utils.DefaultTimeValue, utils.DefaultTimeValue,
now,
} }
// todo 这里以上一步的删除时间作为一个判断条件，是有冲突的可能的
sql += sqlCatAndSku sql += sqlCatAndSku
sqlParams = append(sqlParams, sqlCatAndSkuParams) sqlParams = append(sqlParams, sqlCatAndSkuParams)
globals.SugarLogger.Debug(sql) globals.SugarLogger.Debug(sql)
num, err = dao.ExecuteSQL(db, sql, sqlParams) num, err = dao.ExecuteSQL(db, sql, sqlParams)
globals.SugarLogger.Debug(num) globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num2:%d", ctx.GetTrackInfo(), num)
if err != nil { if err != nil {
return 0, err return 0, err
} }
// 添加toStore中不存在，但fromStore存在的
sql = ` sql = `
INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, sub_store_id, price, unit_price, status, jd_sync_status, elm_sync_status, wsc_sync_status, ebai_sync_status) INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, sub_store_id, price, unit_price, status, jd_sync_status, elm_sync_status, wsc_sync_status, ebai_sync_status, mtwm_sync_status)
SELECT ?, ?, ?, ?, ?, SELECT ?, ?, ?, ?, ?,
t1.sku_id, 0, t1.price * ? / 100, t1.unit_price * ? / 100, t1.status, ?, ?, ?, ? t1.sku_id, 0, t1.price * ? / 100, t1.unit_price * ? / 100, t1.status, ?, ?, ?, ?, ?
FROM store_sku_bind t1 FROM store_sku_bind t1
JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ?
JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ?
JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? LEFT JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ?
LEFT JOIN store_sku_bind t0 ON t1.sku_id = t0.sku_id AND t0.store_id = ? AND t0.deleted_at = ? LEFT JOIN store_sku_bind t0 ON t1.sku_id = t0.sku_id AND t0.store_id = ? AND t0.deleted_at = ?
WHERE t1.store_id = ? AND t1.deleted_at = ? WHERE t1.store_id = ? AND t1.deleted_at = ?
` `
@@ -936,6 +945,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
model.SyncFlagNewMask, model.SyncFlagNewMask,
model.SyncFlagNewMask, model.SyncFlagNewMask,
model.SyncFlagNewMask, model.SyncFlagNewMask,
model.SyncFlagNewMask,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
@@ -950,6 +960,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
if err != nil { if err != nil {
return 0, err return 0, err
} }
globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num3:%d", ctx.GetTrackInfo(), num)
dao.Commit(db) dao.Commit(db)
return num, err return num, err
} }