This commit is contained in:
gazebo
2018-09-17 19:02:55 +08:00
parent b1eb5325c7
commit e2caafc4c9
2 changed files with 19 additions and 5 deletions

View File

@@ -274,9 +274,26 @@ func AddStoreVendorMap(db *dao.DaoDB, storeID, vendorID int, storeMap *model.Sto
storeMap.DeliveryType = store.DeliveryType
storeMap.Status = store.Status
storeMap.SyncStatus = model.SyncFlagModifiedMask // 新增绑定门店是修改的概念
if db == nil {
db = dao.GetDB()
}
dao.Begin(db)
defer func() {
if r := recover(); r != nil {
dao.Rollback(db)
panic(r)
}
}()
if err = dao.CreateEntity(db, storeMap); err == nil {
outStoreMap = storeMap
err = CurVendorSync.SyncStore(db, storeMap.VendorID, store, true, userName)
store.ID = storeID
if err = dao.GetEntity(db, store); err == nil {
dao.Commit(db)
outStoreMap = storeMap
err = CurVendorSync.SyncStore(db, storeMap.VendorID, store, true, userName)
}
}
if err != nil {
dao.Rollback(db)
}
}
} else {