Merge remote-tracking branch 'origin/dev' into dev

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

@@ -65,9 +65,11 @@ public class BannersParam implements Serializable {
     private List positionList;
 
     @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"1\", \"2\", \"5\"]")
-//    @NotEmpty(message = "请选择推广省份")
     private List provincesList;
 
+    @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京\", \"天津\", \"上海\"]")
+    private List provincesNameList;
+
     @JsonIgnore
     public KylinBanners getFields(String bannersId, String createdAt) {
         KylinBanners fields = new KylinBanners();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BannersVo.java

@@ -60,6 +60,9 @@ public class BannersVo implements Serializable {
     @ApiModelProperty(value = "推广省份 多选 数组")
     private List provincesList;
 
+    @ApiModelProperty(value = "城市名称")
+    private List provincesNameList;
+
     @ApiModelProperty(value = "是否删除 0已删除,1正常")
     private Integer isDeleted;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java

@@ -35,14 +35,14 @@ public class KylinBannersController {
     @ApiOperation("banner列表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 4演出 5积分商城 6YB 8视频", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "provinceCode", value = "城市code"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "provinceName", value = "城市名称"),
     })
     public ResponseDto<List<BannersVo>> blist(
             @RequestParam() String position,
-            @RequestParam(defaultValue = "") String provinceCode
+            @RequestParam(defaultValue = "") String provinceName
     ) {
         List result = new ArrayList();
-        result = kylinBannersServiceImpl.blist(position, provinceCode);
+        result = kylinBannersServiceImpl.blist(position, provinceName);
 
         return ResponseDto.success(result);
     }

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

@@ -245,7 +245,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
     }
 
-    public List blist(String position, String provinceCode) {
+    public List blist(String position, String provinceName) {
         Query query = new Query();
         query.addCriteria(
                 Criteria.where("isOnline").is(1).and("isDeleted").is(1)
@@ -267,8 +267,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
 
         Criteria mergeCriteriaPromotion = new Criteria();
-        if (!provinceCode.isEmpty()) {
-            Criteria promotionCity = Criteria.where("provincesList").in(provinceCode);
+        if (!provinceName.isEmpty()) {
+            Criteria promotionCity = Criteria.where("provincesNameList").in(provinceName);
             Criteria promotionAll = Criteria.where("promotionType").is(1);
             mergeCriteriaPromotion.orOperator(promotionCity, promotionAll);
         }