From e742d88efd9bef9de792894a9746fbe898be9b3b Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 5 Dec 2019 09:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5ThingMap=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E7=9A=84=E5=90=8C=E6=AD=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 28 +++++++++--------- business/jxstore/cms/sync.go | 56 ++++++++++++++++++++++++++++++++---- business/model/sync_map.go | 4 +-- globals/beegodb/beegodb.go | 2 +- 4 files changed, 67 insertions(+), 23 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index f4a4b0e8a..da7a1893a 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -109,7 +109,7 @@ func AddCategory(ctx *jxcontext.Context, cat *model.SkuCategory, userName string dao.Rollback(db) return nil, err } - if err = OnCreateThing(db, int64(cat.ID), model.ThingTypeCategory); err != nil { + if err = OnCreateThing(ctx, db, int64(cat.ID), model.ThingTypeCategory); err != nil { dao.Rollback(db) return nil, err } @@ -147,7 +147,7 @@ func UpdateCategory(ctx *jxcontext.Context, categoryID int, payload map[string]i dao.Rollback(db) return 0, err } - if err = OnUpdateThing(db, int64(categoryID), model.ThingTypeCategory); err != nil { + if err = OnUpdateThing(ctx,db, int64(categoryID), model.ThingTypeCategory); err != nil { dao.Rollback(db) return 0, err } @@ -241,7 +241,7 @@ func ReorderCategories(ctx *jxcontext.Context, parentID int, categoryIDs []int, dao.Rollback(db) return err } - if err = OnUpdateThing(db, int64(catsMap[v].ID), model.ThingTypeCategory); err != nil { + if err = OnUpdateThing(ctx,db, int64(catsMap[v].ID), model.ThingTypeCategory); err != nil { dao.Rollback(db) return err } @@ -293,7 +293,7 @@ func DeleteCategory(ctx *jxcontext.Context, categoryID int, userName string) (nu dao.Rollback(db) return 0, err } - if err = OnDeleteThing(db, int64(categoryID), model.ThingTypeCategory); err != nil { + if err = OnDeleteThing(ctx,db, int64(categoryID), model.ThingTypeCategory); err != nil { dao.Rollback(db) return 0, err } @@ -663,7 +663,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s dao.Rollback(db) return nil, err } - if err = OnCreateThing(db, int64(skuNameExt.SkuName.ID), model.ThingTypeSkuName); err != nil { + if err = OnCreateThing(ctx,db, int64(skuNameExt.SkuName.ID), model.ThingTypeSkuName); err != nil { dao.Rollback(db) return nil, err } @@ -779,7 +779,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf dao.Rollback(db) return 0, err } - if err = OnUpdateThing(db, int64(nameID), model.ThingTypeSkuName); err != nil { + if err = OnUpdateThing(ctx,db, int64(nameID), model.ThingTypeSkuName); err != nil { dao.Rollback(db) return 0, err } @@ -816,7 +816,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf return 0, err } - if err = OnUpdateThing(db, int64(v.ID), model.ThingTypeSku); err != nil { + if err = OnUpdateThing(ctx,db, int64(v.ID), model.ThingTypeSku); err != nil { dao.Rollback(db) return 0, err } @@ -887,14 +887,14 @@ func DeleteSkuName(ctx *jxcontext.Context, nameID int, userName string) (num int return 0, err } - if err = OnDeleteThing(db, int64(v.ID), model.ThingTypeSku); err != nil { + if err = OnDeleteThing(ctx,db, int64(v.ID), model.ThingTypeSku); err != nil { dao.Rollback(db) return 0, err } } } - if err = OnDeleteThing(db, int64(nameID), model.ThingTypeSkuName); err != nil { + if err = OnDeleteThing(ctx,db, int64(nameID), model.ThingTypeSkuName); err != nil { dao.Rollback(db) return 0, err } @@ -943,7 +943,7 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string) dao.Rollback(db) return nil, err } - if err = OnCreateThing(db, int64(sku.ID), model.ThingTypeSku); err != nil { + if err = OnCreateThing(ctx,db, int64(sku.ID), model.ThingTypeSku); err != nil { dao.Rollback(db) return nil, err } @@ -1004,7 +1004,7 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{} } return 0, err } - if err = OnUpdateThing(db, int64(skuID), model.ThingTypeSku); err != nil { + if err = OnUpdateThing(ctx,db, int64(skuID), model.ThingTypeSku); err != nil { dao.Rollback(db) return 0, err } @@ -1069,7 +1069,7 @@ func DeleteSku(ctx *jxcontext.Context, skuID int, userName string) (num int64, e dao.Rollback(db) return 0, err } - if err = OnDeleteThing(db, int64(skuID), model.ThingTypeSku); err != nil { + if err = OnDeleteThing(ctx,db, int64(skuID), model.ThingTypeSku); err != nil { dao.Rollback(db) return 0, err } @@ -1149,7 +1149,7 @@ func AddSkuNamePlace(ctx *jxcontext.Context, nameID, placeCode int, userName str dao.Rollback(db) return nil, err } - if err = OnUpdateThing(db, int64(nameID), model.ThingTypeSkuName); err != nil { + if err = OnUpdateThing(ctx,db, int64(nameID), model.ThingTypeSkuName); err != nil { dao.Rollback(db) return nil, err } @@ -1179,7 +1179,7 @@ func DeleteSkuNamePlace(ctx *jxcontext.Context, nameID, placeCode int, userName } return 0, err } - if err = OnUpdateThing(db, int64(nameID), model.ThingTypeSkuName); err != nil { + if err = OnUpdateThing(ctx,db, int64(nameID), model.ThingTypeSkuName); err != nil { dao.Rollback(db) return 0, err } diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 9999de846..5ecadfab7 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -716,14 +716,58 @@ func GetTimeMixByInt(begin1, end1, begin2, end2 int16) (beginAt, endAt int16) { return beginAt, endAt } -func OnCreateThing(db *dao.DaoDB, thingID int64, thingType int8) (err error) { - return err +func OnCreateThing(ctx *jxcontext.Context, db *dao.DaoDB, thingID int64, thingType int8) (err error) { + for _, v := range getMultiStoreVendorInfoList() { + thingMap := &model.ThingMap{ + ThingID: thingID, + ThingType: thingType, + VendorID: v.VendorID, + VendorOrgCode: v.OrgCode, + SyncStatus: model.SyncFlagNewMask, + } + dao.WrapAddIDCULDEntity(thingMap, ctx.GetUserName()) + err = dao.CreateEntity(db, thingMap) + } + return nil } -func OnUpdateThing(db *dao.DaoDB, thingID int64, thingType int8) (err error) { - return err +func OnUpdateThing(ctx *jxcontext.Context, db *dao.DaoDB, thingID int64, thingType int8) (err error) { + for _, v := range getMultiStoreVendorInfoList() { + thingMap := &model.ThingMap{ + ThingID: thingID, + ThingType: thingType, + VendorID: v.VendorID, + VendorOrgCode: v.OrgCode, + } + thingMap.DeletedAt = utils.DefaultTimeValue + if err = dao.GetEntity(db, thingMap, "ThingID", "ThingType", "VendorID", "VendorOrgCode", model.FieldDeletedAt); err == nil { + thingMap.SyncStatus |= model.SyncFlagModifiedMask + thingMap.LastOperator = ctx.GetUserName() + _, err = dao.UpdateEntity(db, thingMap) + } + } + return nil } -func OnDeleteThing(db *dao.DaoDB, thingID int64, thingType int8) (err error) { - return err +func OnDeleteThing(ctx *jxcontext.Context, db *dao.DaoDB, thingID int64, thingType int8) (err error) { + for _, v := range getMultiStoreVendorInfoList() { + thingMap := &model.ThingMap{ + ThingID: thingID, + ThingType: thingType, + VendorID: v.VendorID, + VendorOrgCode: v.OrgCode, + } + thingMap.DeletedAt = utils.DefaultTimeValue + if err = dao.GetEntity(db, thingMap, "ThingID", "ThingType", "VendorID", "VendorOrgCode", model.FieldDeletedAt); err == nil { + if model.IsSyncStatusNew(thingMap.SyncStatus) { + thingMap.SyncStatus = 0 + } else { + thingMap.SyncStatus |= model.SyncFlagDeletedMask + } + _, err = dao.DeleteEntityLogically(db, thingMap, map[string]interface{}{ + model.FieldSyncStatus: thingMap.SyncStatus, + }, ctx.GetUserName(), nil) + } + } + return nil } diff --git a/business/model/sync_map.go b/business/model/sync_map.go index 2577356df..05c10cfc5 100644 --- a/business/model/sync_map.go +++ b/business/model/sync_map.go @@ -14,13 +14,13 @@ type ThingMap struct { VendorID int `orm:"column(vendor_id)" json:"vendorID"` VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空 - VendorThingID string `orm:"size(32);column(vendor_thing_id)" json:"vendorThingID"` + VendorThingID string `orm:"size(32);column(vendor_thing_id);index" json:"vendorThingID"` SyncStatus int8 `orm:"default(2)"` } func (*ThingMap) TableUnique() [][]string { return [][]string{ []string{"ThingID", "ThingType", "VendorID", "VendorOrgCode", "DeletedAt"}, - []string{"VendorThingID", "ThingType", "VendorID", "VendorOrgCode", "DeletedAt"}, + // []string{"VendorThingID", "ThingType", "VendorID", "VendorOrgCode", "DeletedAt"}, } } diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 28b108a3b..4a10b5e41 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -32,7 +32,7 @@ func Init() { orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{}, &model.StoreCourierMap{}) orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{}) orm.RegisterModel(&model.SkuCategory{}) - // orm.RegisterModel(&model.ThingMap{}) + orm.RegisterModel(&model.ThingMap{}) orm.RegisterModel(&model.AuthBind{}, &model.User{})