banners 前端列表搜索

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersApiSearchParam.java

@@ -16,10 +16,10 @@ import java.io.Serializable;
 @Data
 public class BannersApiSearchParam implements Serializable {
 
-    @ApiModelProperty(value = "展示的位置", example = "6")
-    private Integer positionList;
+    @ApiModelProperty(value = "展示的位置", example = "11")
+    private String position;
 
-    @ApiModelProperty(value = "当前用户省份code", example = "660001")
-    private Integer provinceCode;
+    @ApiModelProperty(value = "当前用户省份code", example = "4")
+    private String provinceCode;
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinBannersServiceImpl.java

@@ -247,13 +247,27 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
     }
 
     public List blist(BannersApiSearchParam bannersApiSearchParam) {
+        Query query = new Query();
+        query.addCriteria(
+                Criteria.where("isOnline").is(1).and("isDeleted").is(1)
+        );
+        if (!bannersApiSearchParam.getPosition().isEmpty()) {
+            query.addCriteria(
+                    Criteria.where("positionList").in(bannersApiSearchParam.getPosition())
+            );
+        }
+
+        if (!bannersApiSearchParam.getProvinceCode().isEmpty()) {
+            Criteria c1 = Criteria.where("provincesList").in(bannersApiSearchParam.getProvinceCode());
+            Criteria c2 = Criteria.where("promotionType").is(1);
+            Criteria cr = new Criteria();
+            query.addCriteria(
+                    cr.orOperator(c1, c2)
+            );
+        }
+
         List bannerList = mongoTemplate.find(
-                Query.query(
-                        Criteria.where("positionList").is(bannersApiSearchParam.getPositionList())
-                                .and("isOnline").is(1).and("isDeleted").is(1)
-                                .and("provinceCode").is(bannersApiSearchParam.getProvinceCode()) // todo 或者类型是全国
-//                                .and("positionList").in("11","22")
-                ),
+                query,
                 BannersVo.class,
                 BannersVo.class.getSimpleName()
         );