- GetOrders中指定了vendorOrderID参数后，不忽略vendorIDs参数

business/jxcallback/orderman/orderman_ext.go

@@ -265,17 +265,6 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
 			}
 			sqlWhere += ")"
 		}
-
-		if params["vendorIDs"] != nil {
-			var vendorIDs []int
-			if err = utils.UnmarshalUseNumber([]byte(params["vendorIDs"].(string)), &vendorIDs); err != nil {
-				return nil, err
-			}
-			if len(vendorIDs) > 0 {
-				sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDs)) + ")"
-				sqlParams = append(sqlParams, vendorIDs)
-			}
-		}
 		if params["waybillVendorIDs"] != nil {
 			var waybillVendorIDs []int
 			if err = utils.UnmarshalUseNumber([]byte(params["waybillVendorIDs"].(string)), &waybillVendorIDs); err != nil {
@@ -328,6 +317,16 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, fromDateStr, toDateStr
 			}
 		}
 	}
+	if params["vendorIDs"] != nil {
+		var vendorIDs []int
+		if err = utils.UnmarshalUseNumber([]byte(params["vendorIDs"].(string)), &vendorIDs); err != nil {
+			return nil, err
+		}
+		if len(vendorIDs) > 0 {
+			sqlWhere += " AND t1.vendor_id IN (" + dao.GenQuestionMarks(len(vendorIDs)) + ")"
+			sqlParams = append(sqlParams, vendorIDs)
+		}
+	}
 	sql += sqlWhere
 	sql += `
 	ORDER BY t1.order_created_at DESC