diff --git a/apis/types.api b/apis/types.api index 783566b..3dfe833 100644 --- a/apis/types.api +++ b/apis/types.api @@ -634,8 +634,10 @@ type ( PublishableKey string `json:"publishable_key"` } QueryOrderListRequest { - Page int `form:"page" validate:"required"` - Size int `form:"size" validate:"required"` + Page int `form:"page" validate:"required"` + Size int `form:"size" validate:"required"` + Status uint8 `form:"status,omitempty"` + Search string `form:"search,omitempty"` } QueryOrderListResponse { Total int64 `json:"total"` diff --git a/internal/logic/public/order/queryOrderListLogic.go b/internal/logic/public/order/queryOrderListLogic.go index 13deaa3..41e0e08 100644 --- a/internal/logic/public/order/queryOrderListLogic.go +++ b/internal/logic/public/order/queryOrderListLogic.go @@ -35,7 +35,7 @@ func (l *QueryOrderListLogic) QueryOrderList(req *types.QueryOrderListRequest) ( logger.Error("current user is not found in context") return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access") } - total, data, err := l.svcCtx.OrderModel.QueryOrderListByPage(l.ctx, req.Page, req.Size, 0, u.Id, 0, "") + total, data, err := l.svcCtx.OrderModel.QueryOrderListByPage(l.ctx, req.Page, req.Size, req.Status, u.Id, 0, req.Search) if err != nil { l.Errorw("[QueryOrderListLogic] Query order list failed", logger.Field("error", err.Error())) return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Query order list failed") diff --git a/internal/types/types.go b/internal/types/types.go index 58fb7b0..e235d4c 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1679,8 +1679,10 @@ type QueryOrderDetailRequest struct { } type QueryOrderListRequest struct { - Page int `form:"page" validate:"required"` - Size int `form:"size" validate:"required"` + Page int `form:"page" validate:"required"` + Size int `form:"size" validate:"required"` + Status uint8 `form:"status,omitempty"` + Search string `form:"search,omitempty"` } type QueryOrderListResponse struct {