This commit is contained in:
苏尹岚
2021-03-31 17:00:41 +08:00
parent b784fa92ca
commit 999765eb08
14 changed files with 54 additions and 54 deletions

View File

@@ -577,9 +577,9 @@ func (c *OrderManager) GetWaybills(ctx *jxcontext.Context, fromDateStr, toDateSt
panic(r)
}
}()
if err = dao.GetRows(db, &waybills, sql, sqlParams...); err == nil {
if err = dao.GetRowsTx(txDB, &waybills, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db),
TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: waybills,
}
}
@@ -710,9 +710,9 @@ func (c *OrderManager) GetOrdersFinancial(ctx *jxcontext.Context, fromDateStr, t
panic(r)
}
}()
if err = dao.GetRows(db, &orders, sql, sqlParams...); err == nil {
if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db),
TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: orders,
}
}
@@ -1029,9 +1029,9 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
}
}
}()
if err = dao.GetRows(db, &orders, sql, sqlParams...); err == nil {
if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
pagedInfo = &model.PagedInfo{
TotalCount: dao.GetLastTotalRowCount(db),
TotalCount: dao.GetLastTotalRowCount2(db, txDB),
Data: orders,
}
dao.Commit(db, txDB)