diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index fa1a9d17b..ba33c7d9d 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -265,8 +265,9 @@ func DeleteCategoryMap(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int) (n } catMap := &model.StoreSkuCategoryMap{} return dao.DeleteEntityLogically(db, catMap, map[string]interface{}{ - model.FieldElmSyncStatus: model.SyncFlagDeletedMask, model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask, + model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask, + model.FieldWscSyncStatus: model.SyncFlagDeletedMask, }, ctx.GetUserName(), map[string]interface{}{ model.FieldCategoryID: categoryID, model.FieldDeletedAt: utils.DefaultTimeValue, @@ -932,7 +933,7 @@ func DeleteStoreSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuID int) (n storeSkuBind := &model.StoreSkuBind{} _, err = dao.DeleteEntityLogically(db, storeSkuBind, map[string]interface{}{ model.FieldJdSyncStatus: model.SyncFlagDeletedMask, - model.FieldElmSyncStatus: model.SyncFlagDeletedMask, + model.FieldWscSyncStatus: model.SyncFlagDeletedMask, model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask, }, ctx.GetUserName(), map[string]interface{}{ model.FieldSkuID: v.ID, diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 3a6f096fa..318b98741 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -106,8 +106,8 @@ type StoreSkuBindSkuInfo struct { SkuID int `json:"skuID"` IsSale int `json:"isSale,omitempty"` // -1:不可售,0:忽略,1:可售 - ElmID int64 `json:"elmID,omitempty"` - EbaiID int64 `json:"ebaiID,omitempty"` + // ElmID int64 `json:"elmID,omitempty"` + // EbaiID int64 `json:"ebaiID,omitempty"` } // UpdateStoreSku用,API调用时 @@ -1216,7 +1216,6 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{ model.FieldStatus: model.StoreSkuBindStatusDeleted, model.FieldJdSyncStatus: model.SyncFlagDeletedMask, - model.FieldElmSyncStatus: model.SyncFlagDeletedMask, model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask, model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask, model.FieldWscSyncStatus: model.SyncFlagDeletedMask, @@ -1261,7 +1260,6 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs // } if len(updateFieldMap) > 0 { updateFieldMap[model.FieldJdSyncStatus] = 1 - updateFieldMap[model.FieldElmSyncStatus] = 1 updateFieldMap[model.FieldEbaiSyncStatus] = 1 updateFieldMap[model.FieldMtwmSyncStatus] = 1 updateFieldMap[model.FieldWscSyncStatus] = 1 diff --git a/business/model/model.go b/business/model/model.go index 67ae8edab..f87c38924 100644 --- a/business/model/model.go +++ b/business/model/model.go @@ -5,16 +5,16 @@ import ( ) const ( - FieldID = "ID" - FieldParentID = "ParentID" - FieldDeletedAt = "DeletedAt" - FieldCreatedAt = "CreatedAt" - FieldUpdatedAt = "UpdatedAt" - FieldLastOperator = "LastOperator" - FieldStatus = "Status" - FieldSyncStatus = "SyncStatus" - FieldJdSyncStatus = "JdSyncStatus" - FieldElmSyncStatus = "ElmSyncStatus" + FieldID = "ID" + FieldParentID = "ParentID" + FieldDeletedAt = "DeletedAt" + FieldCreatedAt = "CreatedAt" + FieldUpdatedAt = "UpdatedAt" + FieldLastOperator = "LastOperator" + FieldStatus = "Status" + FieldSyncStatus = "SyncStatus" + FieldJdSyncStatus = "JdSyncStatus" + // FieldElmSyncStatus = "ElmSyncStatus" FieldEbaiSyncStatus = "EbaiSyncStatus" FieldMtwmSyncStatus = "MtwmSyncStatus" FieldWscSyncStatus = "WscSyncStatus" @@ -27,8 +27,8 @@ const ( FieldCategoryID = "CategoryID" - FieldJdID = "JdID" - FieldElmID = "ElmID" + FieldJdID = "JdID" + // FieldElmID = "ElmID" FieldEbaiID = "EbaiID" FieldMtwmID = "MtwmID" FieldWscID = "WscID"