diff --git a/backend/cmd/server/VERSION b/backend/cmd/server/VERSION index 0f1ab4cbbc..4af62ef6ed 100644 --- a/backend/cmd/server/VERSION +++ b/backend/cmd/server/VERSION @@ -1 +1 @@ -0.1.108.142 +0.1.108.143 diff --git a/backend/internal/handler/admin/payment_handler.go b/backend/internal/handler/admin/payment_handler.go index 17648402ff..f964b8d157 100644 --- a/backend/internal/handler/admin/payment_handler.go +++ b/backend/internal/handler/admin/payment_handler.go @@ -60,6 +60,7 @@ func (h *PaymentHandler) ListOrders(c *gin.Context) { Status: c.Query("status"), OrderType: c.Query("order_type"), PaymentType: c.Query("payment_type"), + Keyword: c.Query("keyword"), }) if err != nil { response.ErrorFrom(c, err) diff --git a/backend/internal/service/payment_order.go b/backend/internal/service/payment_order.go index d61a0d889c..f4e7aa392c 100644 --- a/backend/internal/service/payment_order.go +++ b/backend/internal/service/payment_order.go @@ -354,6 +354,13 @@ func (s *PaymentService) AdminListOrders(ctx context.Context, userID int64, p Or if p.PaymentType != "" { q = q.Where(paymentorder.PaymentTypeEQ(p.PaymentType)) } + if p.Keyword != "" { + q = q.Where(paymentorder.Or( + paymentorder.OutTradeNoContainsFold(p.Keyword), + paymentorder.UserEmailContainsFold(p.Keyword), + paymentorder.UserNameContainsFold(p.Keyword), + )) + } total, err := q.Clone().Count(ctx) if err != nil { return nil, 0, fmt.Errorf("count admin orders: %w", err) diff --git a/backend/internal/service/payment_service.go b/backend/internal/service/payment_service.go index a8d0f47ee4..e96e3b7430 100644 --- a/backend/internal/service/payment_service.go +++ b/backend/internal/service/payment_service.go @@ -95,6 +95,7 @@ type OrderListParams struct { Status string OrderType string PaymentType string + Keyword string } type RefundPlan struct { diff --git a/frontend/src/views/admin/orders/AdminOrdersView.vue b/frontend/src/views/admin/orders/AdminOrdersView.vue index 6ea7169e44..6d2db6c93c 100644 --- a/frontend/src/views/admin/orders/AdminOrdersView.vue +++ b/frontend/src/views/admin/orders/AdminOrdersView.vue @@ -24,7 +24,12 @@ - +