This commit is contained in:
邹宗楠
2022-07-12 17:52:03 +08:00
parent 7ddb256847
commit 6c0d4755e2

View File

@@ -88,7 +88,7 @@ func GetOrderListByStatus(userId string, status, pageSize, pageNum int) (map[str
params := make([]interface{}, 0, 0) params := make([]interface{}, 0, 0)
sql := `SELECT SQL_CALC_FOUND_ROWS * FROM withdrawal_record WHERE user_id = ? AND order_status = ? AND deleted_at = ?` sql := `SELECT SQL_CALC_FOUND_ROWS * FROM withdrawal_record WHERE user_id = ? AND order_status = ? AND deleted_at = ?`
params = append(params, userId, status, utils.DefaultTimeValue) params = append(params, userId, status, utils.DefaultTimeValue)
sql += " ORDER BY a.created_at DESC" sql += " ORDER BY created_at DESC"
sql += " LIMIT ? OFFSET ?" sql += " LIMIT ? OFFSET ?"
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)
params = append(params, pageSize, (pageNum-1)*pageSize) params = append(params, pageSize, (pageNum-1)*pageSize)
@@ -135,7 +135,7 @@ func GetUserWithdrawalList(param *model.OrderListParam) ([]*model.WithdrawalList
dao.Commit(db, tx) dao.Commit(db, tx)
}() }()
if param.OrderId != "" { if param.OrderId != "" {
sql += ` AND w.order_id LIKE ? ORDER BY a.created_at DESC LIMIT ? OFFSET ?` sql += ` AND w.order_id LIKE ? ORDER BY w.created_at DESC LIMIT ? OFFSET ?`
sqlParam = append(sqlParam, "%"+param.OrderId+"%", param.PageSize, (param.PageNum-1)*param.PageSize) sqlParam = append(sqlParam, "%"+param.OrderId+"%", param.PageSize, (param.PageNum-1)*param.PageSize)
if err := dao.GetRowsTx(tx, &result, sql, sqlParam...); err != nil { if err := dao.GetRowsTx(tx, &result, sql, sqlParam...); err != nil {
return nil, 0, err return nil, 0, err
@@ -167,7 +167,7 @@ func GetUserWithdrawalList(param *model.OrderListParam) ([]*model.WithdrawalList
sql += ` AND w.created_at < ? ` sql += ` AND w.created_at < ? `
sqlParam = append(sqlParam, utils.Str2TimeWithDefault(param.EndTime, utils.DefaultTimeValue)) sqlParam = append(sqlParam, utils.Str2TimeWithDefault(param.EndTime, utils.DefaultTimeValue))
} }
sql += ` ORDER BY a.created_at DESC LIMIT ? OFFSET ?` sql += ` ORDER BY w.created_at DESC LIMIT ? OFFSET ?`
sqlParam = append(sqlParam, param.PageSize, (param.PageNum-1)*param.PageSize) sqlParam = append(sqlParam, param.PageSize, (param.PageNum-1)*param.PageSize)
if err := dao.GetRowsTx(tx, &result, sql, sqlParam...); err != nil { if err := dao.GetRowsTx(tx, &result, sql, sqlParam...); err != nil {