4

internal/logic/search.go

@@ -47,6 +47,10 @@ func search(index string, bomId int, bomItems []model.BomItem, deliveryType, sor
 		return nil, err
 		return nil, err
 	}
 	}
 	res, err := search.Do(context.Background())
 	res, err := search.Do(context.Background())
+
+	common.PrintDebug(res.Responses)
+
+
 	if err != nil {
 	if err != nil {
 		return
 		return
 	}
 	}
@@ -176,7 +180,7 @@ func getTermQuery(bomItem model.BomItem, sort int, flag bool,isAlike bool) (quer
 	//	query = query.Filter(es.NewRangeQuery("single_price").Gt(0))
 	//	query = query.Filter(es.NewRangeQuery("single_price").Gt(0))
 	//}
 	//}
 	//只显示起订量大于0
 	//只显示起订量大于0
-	query.Must(es.NewRangeQuery("moq").Lte(bomItem.Number))  //todo 2021.4.17 起订量高于需求数量的排除；
+	query.Must(es.NewRangeQuery("moq").Lte(bomItem.Number*bomItem.Amount))  //todo 2021.4.17 起订量高于需求数量的排除；
 
 
 	if configs.ApiSetting.Mode != "debug" {
 	if configs.ApiSetting.Mode != "debug" {
 		query = query.Filter(es.NewTermQuery("status", 1))
 		query = query.Filter(es.NewTermQuery("status", 1))