功能：增加订单搜索与状态筛选

backend/internal/handler/merchant.go

@@ -89,9 +89,9 @@ func (h *MerchantHandler) UpdateProductStatus(c *gin.Context) {
 func (h *MerchantHandler) ListOrders(c *gin.Context) {
 	page, size := pageParams(c)
 	orderSource := strings.TrimSpace(c.Query("order_source"))
-	list, total, err := h.fulfillmentSvc.ListOrders(middleware.GetMerchantID(c), page, size, c.Query("order_status"), orderSource)
+	list, total, err := h.fulfillmentSvc.ListOrders(middleware.GetMerchantID(c), page, size, c.Query("order_status"), orderSource, c.Query("keyword"))
 	if err != nil {
-		if orderSource != "" && err.Error() == "无效的订单来源" {
+		if err.Error() == "无效的订单来源" || err.Error() == "无效的订单状态" {
 			response.BadRequest(c, err.Error())
 			return
 		}

backend/internal/service/fulfillment_query.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"errors"
+	"strings"
 	"time"
 
 	"affiliate_dash/internal/model"
@@ -23,10 +24,15 @@ func (s *FulfillmentService) GetOrder(merchantID uint, orderNo string) (*model.F
 	return &order, nil
 }
 
-func (s *FulfillmentService) ListOrders(merchantID uint, page, size int, orderStatus, orderSource string) ([]model.FulfillmentOrder, int64, error) {
+func (s *FulfillmentService) ListOrders(merchantID uint, page, size int, orderStatus, orderSource, keyword string) ([]model.FulfillmentOrder, int64, error) {
 	page, size = normalizePage(page, size)
 	tx := s.db.Model(&model.FulfillmentOrder{}).Where("merchant_id = ?", merchantID)
 	if orderStatus != "" {
+		switch orderStatus {
+		case model.OrderStatusPaid, model.OrderStatusDelivering, model.OrderStatusDelivered, model.OrderStatusShipFailed, model.OrderStatusCancelled:
+		default:
+			return nil, 0, errors.New("无效的订单状态")
+		}
 		tx = tx.Where("order_status = ?", orderStatus)
 	}
 	if orderSource != "" {
@@ -37,6 +43,10 @@ func (s *FulfillmentService) ListOrders(merchantID uint, page, size int, orderSt
 			return nil, 0, errors.New("无效的订单来源")
 		}
 	}
+	if keyword = strings.TrimSpace(keyword); keyword != "" {
+		like := "%" + keyword + "%"
+		tx = tx.Where("order_no LIKE ? OR client_order_no LIKE ?", like, like)
+	}
 	var total int64
 	if err := tx.Count(&total).Error; err != nil {
 		return nil, 0, err