From 547a92aa9412575f6dc8c6ab452ae344af4fd2e9 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 17 Apr 2019 16:12:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=9B=E9=80=89=E5=99=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCUserBasicInfoController.java | 3 ++- .../src/main/java/com/iformall/utils/UrlCheck.java | 2 ++ .../iformall/domain/dto/WxCUserBasicInfoDto.java | 11 +++++++++++ .../service/impl/WxCUserBasicInfoServiceImpl.java | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index 7d44c2dc2..323714e13 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -8,6 +8,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.po.*; import com.iformall.enums.EnumAssignTagsTrigger; @@ -486,7 +487,7 @@ public class WxCUserBasicInfoController extends BaseController { @ApiOperation("获取会员过滤器") @PostMapping("/listByFilter") - public ResultData listByFilter(@RequestBody List filterList) { + public ResultData listByFilter(@RequestParam List filterList) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter"); return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java index b19e6ef37..8eac9bf3c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -10,6 +10,8 @@ public class UrlCheck { || url.contains("cimgUpload") || url.contains("ueditor/exec") || url.contains("/wxCUserBasicInfo/importTemplate") + || url.contains("/wxCUserBasicInfo/countByFilter") + || url.contains("/wxCUserBasicInfo/listByFilter") || url.contains("wxMsgCallback") || url.contains("notify") || url.contains("pvlog"); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 5f10ab457..cce6adc26 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -59,6 +59,9 @@ public class WxCUserBasicInfoDto implements Serializable{ @Transient protected String sortColumns; + @Transient + protected List filterList; + public Long getId() { return id; } @@ -164,4 +167,12 @@ public class WxCUserBasicInfoDto implements Serializable{ public void setSortColumns(String sortColumns) { this.sortColumns = sortColumns; } + + public List getFilterList() { + return filterList; + } + + public void setFilterList(List filterList) { + this.filterList = filterList; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 688b1b8e4..bf14f2e79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -77,50 +77,62 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { private final static List memberTimeList = new ArrayList( Arrays.asList( new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1000.getMessage()); setId(EnumTag.ID_1000.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1001.getMessage()); setId(EnumTag.ID_1001.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1002.getMessage()); setId(EnumTag.ID_1002.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1003.getMessage()); setId(EnumTag.ID_1003.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1004.getMessage()); setId(EnumTag.ID_1004.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1005.getMessage()); setId(EnumTag.ID_1005.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1006.getMessage()); setId(EnumTag.ID_1006.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1007.getMessage()); setId(EnumTag.ID_1007.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1008.getMessage()); setId(EnumTag.ID_1008.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1009.getMessage()); setId(EnumTag.ID_1009.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1010.getMessage()); setId(EnumTag.ID_1010.getCode()); }}, new WxTags(){{ + setTypeId(EnumTagType.ID_50.getCode()); setName(EnumTag.ID_1011.getMessage()); setId(EnumTag.ID_1011.getCode()); }} @@ -281,6 +293,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxTags wxTagsBase = new WxTags(); wxTagsBase.setName("普通会员"); + wxTagsBase.setTypeId(EnumTagType.ID_51.getCode()); wxTagsBase.setId(0L); tagsMemberLevel.add(wxTagsBase); @@ -288,6 +301,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { WxTags wxTags = new WxTags(); wxTags.setName(l.getLevel()); wxTags.setId(l.getId()); + wxTags.setTypeId(EnumTagType.ID_51.getCode()); tagsMemberLevel.add(wxTags); });