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

- AddStoreCategoryMap中忽略重复错

Browse Source
This commit is contained in:
gazebo
2019-07-25 18:15:39 +08:00
parent f21666e6bd
commit 60271b83bb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/model/dao/store.go
View File

@@ -340,7 +340,7 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
WscSyncStatus: model.SyncFlagNewMask, WscSyncStatus: model.SyncFlagNewMask,
} }
storeCat.DeletedAt = utils.DefaultTimeValue storeCat.DeletedAt = utils.DefaultTimeValue
if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && err != orm.ErrNoRows { if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && !IsNoRowsError(err) {
return err return err
} }
if vendorID == model.VendorIDMTWM { if vendorID == model.VendorIDMTWM {
@@ -360,7 +360,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
} }
if storeCat.ID == 0 { if storeCat.ID == 0 {
WrapAddIDCULDEntity(storeCat, userName) WrapAddIDCULDEntity(storeCat, userName)
err = CreateEntity(db, storeCat) if err = CreateEntity(db, storeCat); IsDuplicateError(err) {
err = nil
}
} else { } else {
WrapUpdateULEntity(storeCat, userName) WrapUpdateULEntity(storeCat, userName)
_, err = UpdateEntity(db, storeCat) _, err = UpdateEntity(db, storeCat)