价格列表查询条件优化

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/productPrice/ProductPricePageReqVO.java

@@ -95,16 +95,18 @@ public class ProductPricePageReqVO extends PageParam {
 
     @ApiModelProperty(value = "始发地城市id")
     private Long startCityId;
+
     @ApiModelProperty(value = "目的地城市id")
-    private Long destCityId;
+    private List<Long> destCityId;
+
     @ApiModelProperty(value = "运输方式")
     private String transportType;
 
     @ApiModelProperty(value = "国家")
-    private Long destCountryId;
+    private List<Long> destCountryId;
 
     @ApiModelProperty(value = "目的仓")
-    private Long destWarehouseId;
+    private List<Long> destWarehouseId;
 
     @ApiModelProperty(value = "商品编码")
     private String productCode;
@@ -119,4 +121,6 @@ public class ProductPricePageReqVO extends PageParam {
 
     private List<String> existTypeList;
 
+
+
 }

yudao-module-product/yudao-module-product-core/src/main/resources/mapper/product/ProductPriceMapper.xml

@@ -109,17 +109,29 @@
 		<if test="params.startCityId != null">
 			and ew_start.shi = #{params.startCityId}
 		</if>
-		<if test="params.destCityId != null">
-			and ew_dest.shi = #{params.destCityId}
+
+		<!--目的地-->
+		<if test="params.destCityId != null and params.destCityId.size()>0 ">
+			and ew_dest.`shi` in
+			<foreach item='destCity' index='index' collection='params.destCityId' open='(' separator=',' close=')'>
+				#{destCity}
+			</foreach>
 		</if>
 
 		<!--目的国-->
-		<if test="params.destCountryId != null">
-			and ew_dest.guojia=#{params.destCountryId}
+		<if test="params.destCountryId != null and params.destCountryId.size()>0 ">
+			and ew_dest.`guojia` in
+			<foreach item='destCountry' index='index' collection='params.destCountryId' open='(' separator=',' close=')'>
+				#{destCountry}
+			</foreach>
 		</if>
+
 		<!--目的仓-->
-		<if test="params.destWarehouseId != null">
-			and ew_dest.id=#{params.destWarehouseId}
+		<if test="params.destWarehouseId != null and params.destWarehouseId.size()>0 ">
+			and ew_dest.`id` in
+			<foreach item='destWarehouse' index='index' collection='params.destWarehouseId' open='(' separator=',' close=')'>
+				#{destWarehouse}
+			</foreach>
 		</if>
 
 		<if test="params.blacklist != null">