1
This commit is contained in:
@@ -253,11 +253,6 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa
|
||||
param = append(param, orderStatus)
|
||||
}
|
||||
|
||||
// 获取数据条数
|
||||
sql = sql + ` ORDER BY a.created_at DESC LIMIT ? OFFSET ? `
|
||||
pageSize = jxutils.FormalizePageSize(pageSize)
|
||||
param = append(param, pageSize, (pageNum-1)*pageSize)
|
||||
|
||||
// 获取数据
|
||||
var result []*model.UserOrderList
|
||||
db := dao.GetDB()
|
||||
@@ -267,12 +262,16 @@ func QueryUserOrderList(userId string, expressType, orderStatus int, pageNum, pa
|
||||
panic(r)
|
||||
}
|
||||
}()
|
||||
count := dao.GetLastTotalRowCountTx(tx)
|
||||
|
||||
// 获取数据条数
|
||||
sql = sql + ` ORDER BY a.created_at DESC LIMIT ? OFFSET ? `
|
||||
pageSize = jxutils.FormalizePageSize(pageSize)
|
||||
param = append(param, pageSize, (pageNum-1)*pageSize)
|
||||
if err := dao.GetRowsTx(tx, &result, sql, param...); err != nil {
|
||||
tx.Rollback()
|
||||
return nil, 0, err
|
||||
}
|
||||
count := dao.GetLastTotalRowCountTx(tx)
|
||||
tx.Commit()
|
||||
|
||||
return result, count, nil
|
||||
|
||||
Reference in New Issue
Block a user