diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index ac1a1edb5..6ccbaf51d 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -782,12 +782,11 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode now := time.Now() if fromStoreID == toStoreID { - // return 0, fmt.Errorf("源门店:%d与目标门店:%d相同", fromStoreID, toStoreID) sql := ` UPDATE store_sku_bind t1 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_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 = ?, t1.updated_at = ?, 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.elm_sync_status = t1.elm_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 | ? 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, toStoreID, utils.DefaultTimeValue, } @@ -826,22 +827,27 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode } }() if copyMode == CopyStoreSkuModeFresh || copyMode == CopyStoreSkuModeUpdate { + // 将toStore中存在,但fromStore中不存在的置删除标志 sqlDelete := ` 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_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 = ?, t1.updated_at = ?, t1.last_operator = ?, t1.status = ?, - t1.jd_sync_status = IF(t1.jd_sync_status = ?, 0, ?), - t1.elm_sync_status = IF(t1.elm_sync_status = ?, 0, ?), - t1.wsc_sync_status = IF(t1.wsc_sync_status = ?, 0, ?), - t1.ebai_sync_status = IF(t1.ebai_sync_status = ?, 0, ?) - WHERE t1.store_id = ? AND t1.deleted_at = ? + t1.jd_sync_status = IF((t1.jd_sync_status & ?) <> 0, 0, ?), + t1.elm_sync_status = IF((t1.elm_sync_status & ?) <> 0, 0, ?), + t1.wsc_sync_status = IF((t1.wsc_sync_status & ?) <> 0, 0, ?), + t1.mtwm_sync_status = IF((t1.mtwm_sync_status & ?) <> 0, 0, ?), + 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{}{ + fromStoreID, + utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, @@ -857,6 +863,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode model.SyncFlagDeletedMask, model.SyncFlagNewMask, model.SyncFlagDeletedMask, + model.SyncFlagNewMask, + model.SyncFlagDeletedMask, toStoreID, utils.DefaultTimeValue, } @@ -865,28 +873,30 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode sqlDeleteParams = append(sqlDeleteParams, sqlCatAndSkuParams) } // 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 } + globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num1:%d", ctx.GetTrackInfo(), num) } + // 处理toStore中与fromStore中都存在的 sql := ` 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_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 = ?, t1.updated_at = ?, - t1.deleted_at = ?, t1.sub_store_id = 0, t1.price = t0.price * ? / 100, t1.unit_price = t0.unit_price * ? / 100, t1.status = t0.status, - t1.jd_sync_status = ?, - t1.elm_sync_status = ?, - t1.wsc_sync_status = ?, - t1.ebai_sync_status = ? - WHERE t1.store_id = ? AND (t1.deleted_at = ? OR t1.deleted_at = ?) + t1.jd_sync_status = t1.jd_sync_status | ?, + t1.elm_sync_status = t1.elm_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 | ? + WHERE t1.store_id = ? AND t1.deleted_at = ? AND t0.id IS NOT NULL ` sqlParams := []interface{}{ fromStoreID, @@ -896,35 +906,34 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode utils.DefaultTimeValue, userName, now, - utils.DefaultTimeValue, pricePercentage, pricePercentage, - model.SyncFlagNewMask, - model.SyncFlagNewMask, - model.SyncFlagNewMask, - model.SyncFlagNewMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask, + model.SyncFlagModifiedMask | model.SyncFlagPriceMask, toStoreID, utils.DefaultTimeValue, - now, } - // todo 这里以上一步的删除时间作为一个判断条件,是有冲突的可能的 sql += sqlCatAndSku sqlParams = append(sqlParams, sqlCatAndSkuParams) globals.SugarLogger.Debug(sql) 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 { return 0, err } + // 添加toStore中不存在,但fromStore存在的 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 ?, ?, ?, ?, ?, - 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 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_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 = ? 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, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, @@ -950,6 +960,7 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode if err != nil { return 0, err } + globals.SugarLogger.Debugf("CopyStoreSkus trackInfo:%s num3:%d", ctx.GetTrackInfo(), num) dao.Commit(db) return num, err }