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

- refactor DeleteSkuName

Browse Source 
- fix bug in FlatMap(should recursively)
This commit is contained in:
gazebo
2018-11-23 09:43:34 +08:00
parent 334db9d62b
commit fc1e2ded61
3 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
business/jxstore/cms/sku.go
View File

@@ -480,7 +480,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
if num, err = dao.UpdateEntityLogically(db, skuName, valid, userName, nil); err == nil && num == 1 {
if utils.Interface2Int64WithDefault(payload["isGlobal"], 0) == 0 && payload["places"] != nil {
if places, ok := payload["places"].([]interface{}); ok {
if _, err = dao.ExecuteSQL(db, "DELETE FROM sku_name_place_bind WHERE name_id = ?", nameID); err == nil {
if _, err = dao.DeleteSkuNamePlace(db, nameID, nil); err == nil {
for _, placeCode := range places {
placeBind := &model.SkuNamePlaceBind{}
placeBind.PlaceCode = int(utils.Interface2Int64WithDefault(placeCode, 0))
@@ -520,32 +520,32 @@ func DeleteSkuName(ctx *jxcontext.Context, nameID int, userName string) (num int
db := dao.GetDB()
dao.Begin(db)
defer func() {
if r := recover(); r != nil {
dao.Rollback(db)
panic(r)
}
dao.Rollback(db)
}()
if _, err = DeleteStoreSku(ctx, db, nameID, 0); err == nil {
skuName := &model.SkuName{}
skuName.ID = nameID
if num, err = dao.DeleteEntityLogically(db, skuName, nil, userName, nil); err == nil && num == 1 {
dummy := &model.Sku{}
num2, err2 := dao.DeleteEntityLogically(db, dummy, map[string]interface{}{
model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
model.FieldStatus: model.SkuStatusDeleted,
}, userName, map[string]interface{}{
model.FieldNameID: nameID,
})
if err2 == nil {
dao.Commit(db)
if num2 > 0 {
_, err = CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, userName)
}
return num, err
}
}
if _, err := dao.DeleteSkuNamePlace(db, nameID, nil); err != nil {
return 0, err
}
if _, err = DeleteStoreSku(ctx, db, nameID, 0); err != nil {
return 0, err
}
numSku, err := dao.DeleteEntityLogically(db, &model.Sku{}, map[string]interface{}{
model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
model.FieldStatus: model.SkuStatusDeleted,
}, userName, map[string]interface{}{
model.FieldNameID: nameID,
})
if err != nil {
return 0, err
}
skuName := &model.SkuName{}
skuName.ID = nameID
if num, err = dao.DeleteEntityLogically(db, skuName, nil, userName, nil); err != nil {
return 0, err
}
dao.Commit(db)
if numSku > 0 {
_, err = CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, userName)
}
dao.Rollback(db)
return num, err
}