This commit is contained in:
suyl
2021-06-22 17:48:53 +08:00
parent 4df658305a
commit 050da7cc59

View File

@@ -1069,14 +1069,7 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
var orders []*GetAfsOrdersResult var orders []*GetAfsOrdersResult
db := dao.GetDB() db := dao.GetDB()
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer func() { defer dao.Commit(db, txDB)
if r := recover(); r != nil || err != nil {
dao.Rollback(db, txDB)
if r != nil {
panic(r)
}
}
}()
if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{ pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount2(db, txDB), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
@@ -1091,7 +1084,6 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
} }
} }
pagedInfo.Data = orders pagedInfo.Data = orders
dao.Commit(db, txDB)
} }
return pagedInfo, err return pagedInfo, err
} }