From 273459497a732f01515d4a4de4f83aacd2370fd6 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 3 Jan 2024 14:57:02 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flossom-ui/src/views/system/member/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 79e9943..8e71803 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -99,6 +99,7 @@ type="datetimerange" range-separator="至" start-placeholder="开始日期" + value-format="yyyy-MM-dd HH:mm:ss" end-placeholder="结束日期" align="right"> From 474e19de821b2b1f3473f6cb2d27ef034508c88e Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 3 Jan 2024 15:28:09 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=92=8C=E4=BB=AA=E5=99=A8=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxUserMemberMapper.xml | 7 ++++--- flossom-ui/src/views/system/member/index.vue | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index db7ee4d..84dd262 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -95,7 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT and member.nickname like concat('%', #{nickname}, '%') - and member.credit >= #{creditStart} and member.credit <= #{creditEnd} + and member.credit >= #{creditStart} + and member.credit <= #{creditEnd} and member.user_type = #{userType} and member.province_id = #{provinceId} and member.city_id = #{cityId} @@ -121,8 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and member.create_time <= #{params.endTime} - and member.devices_num >= #{deviceNumStart} and member.devices_num <= #{deviceNumEnd} - + and member.devices_num >= #{deviceNumStart} + and member.devices_num <= #{deviceNumEnd} and id in ( SELECT diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 8e71803..1d6ed4c 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -115,14 +115,14 @@ - + 至 - + - + 至 - + From c1ea03d570497f64dd4c4cb94ef8f60f89a73d31 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 3 Jan 2024 17:15:05 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mapper/WxUserMemberMapper.java | 2 +- .../service/impl/WxUserMemberServiceImpl.java | 8 ++-- flossom-ui/src/views/system/member/index.vue | 48 ++++++++++++++++++- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java index 37ffc4a..ebd7e81 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java @@ -74,7 +74,7 @@ public interface WxUserMemberMapper { void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id); - List selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm); + List selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm); List selectUserCount(); diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index dc38174..f91fab2 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -116,7 +116,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { */ @Override public List selectWxUserMemberList(WxUserMemberVm wxUserMemberVm) { - return wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); + return (List) wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); } /** @@ -357,8 +357,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { @Override public List selectWxUserMemberRetList(WxUserMemberVm wxUserMemberVm) { - List list = new ArrayList<>(); - List wxUserMembers = wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); + List wxUserMembers = (List) wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); if (wxUserMembers != null && wxUserMembers.size() > 0) { WxUserMemberRet wxUserMemberRet; for (WxUserMember wxUserMember : wxUserMembers) { @@ -370,10 +369,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); - list.add(wxUserMemberRet); } } - return list; + return wxUserMembers; } @Override diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 1d6ed4c..ba3f9cc 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -1286,6 +1286,52 @@ export default { }; this.resetForm("form"); }, + // 表单重置 + resetQueryParams() { + // 查询参数 + this.queryParams = { + pageNum: 1, + pageSize: 10, + nickname: null, + headimg: null, + username: null, + deviceNumStart: undefined, + deviceNumEnd: undefined, + creditStart: undefined, + creditEnd: undefined, + openid: null, + unionid: null, + userType: null, + level: null, + mobile: null, + password: null, + userQr: null, + provinceId: null, + province: null, + cityId: null, + city: null, + areaId: null, + area: null, + birthday: null, + clock: null, + activity: null, + wechat: null, + code: null, + isAbutment: null, + collagenDay: null, + collagenMount: null, + loginTime: null, + status: null, + // createTime: [], + devicesName: [], //仪器绑定 + wecomTags: [], // 企微标签 + miniProgramTags: [], // 小程序标签 + purchaseChannels: [], // 购买渠道 + isCompleteInformation: null, // 用户信息是否完善 + wxUserRemarkList: null, // 备注列表 + }; + this.resetForm("queryForm"); + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -1294,7 +1340,7 @@ export default { /** 重置按钮操作 */ resetQuery() { this.dateRange = []; - this.resetForm("queryForm"); + this.resetQueryParams(); this.handleQuery(); }, /** 批量操作按钮，显示批量操作弹窗 */ From b297f27c6dbbeb5d5b4b991c5a5a1d9ca84bc6ed Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 4 Jan 2024 10:38:25 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/req/WxUserMemberVm.java | 25 ++++ .../core/mapper/WxUserMemberMapper.java | 5 +- .../resources/mapper/WxUserMemberMapper.xml | 123 +++++++++++++++++- .../service/impl/WxUserMemberServiceImpl.java | 21 +-- 4 files changed, 161 insertions(+), 13 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java index eb08683..4c38f37 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java @@ -102,11 +102,21 @@ public class WxUserMemberVm extends BaseEntity { */ List wecomTags; + /** + * 企微标签个数 + */ + Integer wecomTagNum; + /** * 小程序标签 */ List miniProgramTags; + /** + * 小程序标签 + */ + Integer miniProgramTagNum; + public WxUserMemberVm() { @@ -263,4 +273,19 @@ public class WxUserMemberVm extends BaseEntity { this.miniProgramTags = miniProgramTags; } + public Integer getWecomTagNum() { + return wecomTagNum; + } + + public void setWecomTagNum(Integer wecomTagNum) { + this.wecomTagNum = wecomTagNum; + } + + public Integer getMiniProgramTagNum() { + return miniProgramTagNum; + } + + public void setMiniProgramTagNum(Integer miniProgramTagNum) { + this.miniProgramTagNum = miniProgramTagNum; + } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java index ebd7e81..91785d7 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java @@ -3,6 +3,7 @@ package com.flossom.common.core.mapper; import com.flossom.common.core.domain.entity.WxUserMember; import com.flossom.common.core.domain.req.WxUserMemberVm; +import com.flossom.common.core.domain.ret.WxUserMemberRet; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -74,7 +75,7 @@ public interface WxUserMemberMapper { void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id); - List selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm); + List selectWxUserMemberListByVm(WxUserMemberVm wxUserMemberVm); List selectUserCount(); @@ -84,4 +85,6 @@ public interface WxUserMemberMapper { List selectWxUserMemberByMobile(@Param("mobile") String mobile); List selectWxUserMemberByIdList(@Param("userIdList") List userIdList); + + List selectWxUserMemberRetListByVm(WxUserMemberVm wxUserMemberVm); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index 84dd262..ebdf137 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -38,6 +38,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, nickname, headimg, username, credit, expire_credit, openid, unionid, user_type, level, mobile, province_id, city_id, area_id, province, city, area, birthday, clock, activity, wechat, is_abutment, login_time, is_complete_information, devices_num, status, create_by, create_time, update_by, update_time, remark from wx_user_member @@ -127,14 +161,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and id in ( SELECT - DISTINCT user_id + user_id FROM wx_user_tag WHERE - tag_id IN + type = 2 + AND tag_id IN #{wecomTag} + GROUP BY + user_id + HAVING + COUNT( DISTINCT tag_id ) = #{wecomTagNum} ) @@ -144,10 +183,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM wx_user_tag WHERE - tag_id IN + type = 1 + AND tag_id IN #{miniProgramTag} + GROUP BY + user_id + HAVING + COUNT( DISTINCT tag_id ) = #{miniProgramTagNum} ) and member.status = 0 @@ -311,5 +355,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index f91fab2..cad3c15 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -116,7 +116,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { */ @Override public List selectWxUserMemberList(WxUserMemberVm wxUserMemberVm) { - return (List) wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); + return wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); } /** @@ -357,21 +357,24 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { @Override public List selectWxUserMemberRetList(WxUserMemberVm wxUserMemberVm) { - List wxUserMembers = (List) wxUserMemberMapper.selectWxUserMemberListByVm(wxUserMemberVm); - if (wxUserMembers != null && wxUserMembers.size() > 0) { - WxUserMemberRet wxUserMemberRet; - for (WxUserMember wxUserMember : wxUserMembers) { - wxUserMemberRet = new WxUserMemberRet(); - BeanUtils.copyProperties(wxUserMember, wxUserMemberRet); + if (wxUserMemberVm.getWecomTags() != null) { + wxUserMemberVm.setWecomTagNum(wxUserMemberVm.getWecomTags().size()); + } + if (wxUserMemberVm.getMiniProgramTags() != null) { + wxUserMemberVm.setMiniProgramTagNum(wxUserMemberVm.getMiniProgramTags().size()); + } + List wxUserMemberRetList = wxUserMemberMapper.selectWxUserMemberRetListByVm(wxUserMemberVm); + if (wxUserMemberRetList != null && wxUserMemberRetList.size() > 0) { + for (WxUserMemberRet wxUserMemberRet : wxUserMemberRetList) { WxUserTag wxUserTag = new WxUserTag(); - wxUserTag.setUserId(wxUserMember.getId()); + wxUserTag.setUserId(wxUserMemberRet.getId()); wxUserTag.setType(TagTypeStatus.MINI_PROGRAM.getCode()); wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); wxUserMemberRet.setWecomTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); } } - return wxUserMembers; + return wxUserMemberRetList; } @Override From 00ea0ef8708f823300aa42a6ddab984c3fff6510 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Thu, 4 Jan 2024 15:54:06 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mapper/WxUserMemberMapper.java | 2 + .../resources/mapper/WxUserMemberMapper.xml | 9 + .../service/impl/WxUserMemberServiceImpl.java | 11 +- flossom-ui/src/views/system/member/index.vue | 233 +++++++++--------- 4 files changed, 136 insertions(+), 119 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java index 91785d7..88f2a38 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserMemberMapper.java @@ -86,5 +86,7 @@ public interface WxUserMemberMapper { List selectWxUserMemberByIdList(@Param("userIdList") List userIdList); + List selectWxUserMemberRetByIdList(@Param("userIdList") List userIdList); + List selectWxUserMemberRetListByVm(WxUserMemberVm wxUserMemberVm); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml index ebdf137..427deb7 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml @@ -355,6 +355,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java index cad3c15..da63535 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java @@ -380,14 +380,11 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService { @Override public List selectWxUserMemberByIdList(List userIdList) { List list = new ArrayList<>(); - List wxUserMembers = wxUserMemberMapper.selectWxUserMemberByIdList(userIdList); - if (wxUserMembers != null && wxUserMembers.size() > 0) { - WxUserMemberRet wxUserMemberRet; - for (WxUserMember wxUserMember : wxUserMembers) { - wxUserMemberRet = new WxUserMemberRet(); - BeanUtils.copyProperties(wxUserMember, wxUserMemberRet); + List wxUserMemberRetList = wxUserMemberMapper.selectWxUserMemberRetByIdList(userIdList); + if (wxUserMemberRetList != null && wxUserMemberRetList.size() > 0) { + for (WxUserMemberRet wxUserMemberRet : wxUserMemberRetList) { WxUserTag wxUserTag = new WxUserTag(); - wxUserTag.setUserId(wxUserMember.getId()); + wxUserTag.setUserId(wxUserMemberRet.getId()); wxUserTag.setType(TagTypeStatus.MINI_PROGRAM.getCode()); wxUserMemberRet.setMiniProgramTags(wxUserTagMapper.selectWxUserTagList(wxUserTag)); wxUserTag.setType(TagTypeStatus.ENTERPRISE_WECHAT.getCode()); diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index ba3f9cc..990dd6e 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -16,7 +16,7 @@ - + @@ -115,14 +115,18 @@ - + 至 - + - + 至 - + @@ -200,7 +204,7 @@ - + - +