From a2975c12d065262b8715f0cb157e3307aa9bb367 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 14 May 2019 18:20:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=87=E7=AD=BE][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=87=E7=AD=BE=E7=9A=84=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V201905131644__UPDATE_TAGS.sql | 9 +++++++ .../impl/WxCUserBasicInfoServiceImpl.java | 24 ++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905131644__UPDATE_TAGS.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905131644__UPDATE_TAGS.sql b/mallinkAdmin/src/main/resources/db/migration/V201905131644__UPDATE_TAGS.sql new file mode 100644 index 000000000..dc2ab0060 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905131644__UPDATE_TAGS.sql @@ -0,0 +1,9 @@ +UPDATE `wx_tags` SET `name` = '活跃度低' WHERE (`id` = '110'); +UPDATE `wx_tags` SET `name` = '活跃度中' WHERE (`id` = '111'); +UPDATE `wx_tags` SET `name` = '活跃度高' WHERE (`id` = '112'); +UPDATE `wx_tags` SET `name` = '消费频率低' WHERE (`id` = '107'); +UPDATE `wx_tags` SET `name` = '消费频率中' WHERE (`id` = '108'); +UPDATE `wx_tags` SET `name` = '消费频率高' WHERE (`id` = '109'); +UPDATE `wx_tags` SET `name` = '实惠型消费' WHERE (`id` = '104'); +UPDATE `wx_tags` SET `name` = '享乐型消费' WHERE (`id` = '105'); +UPDATE `wx_tags` SET `name` = '品质型消费' WHERE (`id` = '106'); \ No newline at end of file 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 0ca091318..004508a1b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -73,6 +73,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Autowired WxTagsService wxTagsService; + + /***************user filter start******************************************/ + private final static List memberTimeList = new ArrayList( Arrays.asList( new WxTags(){{ @@ -318,14 +321,6 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return dto; } - public long countByFilter(String tenantId, List filterList) { - return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantId,filterList)); - } - - public List listByFilter(String tenantId, List filterList) { - return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantId,filterList)); - } - private WxTagsTypeVo generateType50() { WxTagsTypeVo type = new WxTagsTypeVo(); type.setFlag(EnumTagTypeFlag.FLAG_SINGLE.getCode()); @@ -388,6 +383,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } + public long countByFilter(String tenantId, List filterList) { + return wxCUserBasicInfoMapper.findCountByFilter(filtersToDto(tenantId,filterList)); + } + + public List listByFilter(String tenantId, List filterList) { + return wxCUserBasicInfoMapper.findListByFilter(filtersToDto(tenantId,filterList)); + } @Override public List listByFilterList(String tenantId, List filterList) { HashSet userSet = new HashSet<>(); @@ -395,6 +397,12 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return new ArrayList<>(userSet); } + + + + + /***************user filter end******************************************/ + @Override public PageInfo listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(record));