From 22897f01e3cb9c452e53791c41190970d41c5374 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Fri, 22 Dec 2023 13:34:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/req/WxUserMemberVm.java | 34 +++++- .../resources/mapper/WxUserMemberMapper.xml | 62 ++++++++--- .../controller/SysRegionController.java | 18 +-- .../system/service/ISysRegionService.java | 2 + .../service/impl/SysRegionServiceImpl.java | 8 ++ flossom-ui/src/api/system/member.js | 10 +- flossom-ui/src/views/system/member/index.vue | 104 ++++++++++++------ 7 files changed, 181 insertions(+), 57 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 25978dc..ccacfaf 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 @@ -3,6 +3,7 @@ package com.flossom.common.core.domain.req; import com.flossom.common.core.web.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 微信用户查询对象 @@ -18,7 +19,7 @@ public class WxUserMemberVm extends BaseEntity { private String id; /** - * 会员昵称 + * 会员昵称（单值搜索） */ private String nickname; @@ -77,12 +78,12 @@ public class WxUserMemberVm extends BaseEntity { private Date endTime; /** - * 设备数量起始值 + * 仪器数量起始值 */ private Integer deviceNumStart; /** - * 设置数量结束值 + * 仪器数量结束值 */ private Integer deviceNumEnd; @@ -93,14 +94,17 @@ public class WxUserMemberVm extends BaseEntity { /** * 购买渠道 */ + List purchaseChannels; /** * 企微标签 */ + List wecomTags; /** * 小程序标签 */ + List miniProgramTags; public WxUserMemberVm() { } @@ -231,4 +235,28 @@ public class WxUserMemberVm extends BaseEntity { public void setDeviceNumEnd(Integer deviceNumEnd) { this.deviceNumEnd = deviceNumEnd; } + + public List getPurchaseChannels() { + return purchaseChannels; + } + + public void setPurchaseChannels(List purchaseChannels) { + this.purchaseChannels = purchaseChannels; + } + + public List getWecomTags() { + return wecomTags; + } + + public void setWecomTags(List wecomTags) { + this.wecomTags = wecomTags; + } + + public List getMiniProgramTags() { + return miniProgramTags; + } + + public void setMiniProgramTags(List miniProgramTags) { + this.miniProgramTags = miniProgramTags; + } } 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 6d23eb3..8dc63b0 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 @@ -41,6 +41,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, nickname, headimg, username, 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 + + member.id, member.nickname, member.headimg, member.username, member.credit, member.openid, member.unionid, member.user_type, member.level, member.mobile, + member.province_id, member.city_id, member.area_id, member.province, member.city, member.area, member.birthday, member.clock, member.activity, + member.wechat, member.is_abutment, member.login_time, member.is_complete_information, member.devices_num, member.status, member.create_by, + member.create_time, member.update_by, member.update_time, member.remark + FROM wx_user_member as member + + diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java index 1afaf2d..0c14358 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysRegionController.java @@ -2,6 +2,7 @@ package com.flossom.system.controller; import javax.servlet.http.HttpServletResponse; +import com.flossom.common.core.domain.R; import com.flossom.common.core.domain.entity.SysRegion; import com.flossom.common.core.utils.poi.ExcelUtil; import com.flossom.common.core.web.controller.BaseController; @@ -11,14 +12,7 @@ import com.flossom.common.log.annotation.Log; import com.flossom.common.log.enums.BusinessType; import com.flossom.common.security.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.flossom.system.service.ISysRegionService; import java.util.List; @@ -97,4 +91,12 @@ public class SysRegionController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(sysRegionService.deleteSysRegionByIds(ids)); } + + /** + * 查询条件：地区列表 + */ + @GetMapping("/getRegionByPid") + public R getRegionByPid(@RequestParam(value = "pid",required = false) Long pid) { + return R.ok(sysRegionService.getRegionByPid(pid)); + } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java index 31d7fef..a92d49a 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ISysRegionService.java @@ -60,4 +60,6 @@ public interface ISysRegionService { * @return 结果 */ public int deleteSysRegionById(Long id); + + List getRegionByPid(Long pid); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java index e60e3db..0c4b2ee 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysRegionServiceImpl.java @@ -85,4 +85,12 @@ public class SysRegionServiceImpl implements ISysRegionService { public int deleteSysRegionById(Long id) { return sysRegionMapper.deleteSysRegionById(id); } + + @Override + public List getRegionByPid(Long pid) { + if (pid == null) { + pid = 0L; + } + return sysRegionMapper.selectSysAreaByPid(pid.intValue()); + } } diff --git a/flossom-ui/src/api/system/member.js b/flossom-ui/src/api/system/member.js index a481632..d1d8236 100644 --- a/flossom-ui/src/api/system/member.js +++ b/flossom-ui/src/api/system/member.js @@ -71,4 +71,12 @@ export function getPurchaseChannel() { }) } - +export function getRegionByPid(pid) { + return request({ + url: '/system/region/getRegionByPid', + method: 'get', + params: { + pid : pid + } + }) +} diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue index 823bdee..5168c19 100644 --- a/flossom-ui/src/views/system/member/index.vue +++ b/flossom-ui/src/views/system/member/index.vue @@ -47,21 +47,33 @@ - - - + + + - - - + + + - - - + + + @@ -75,29 +87,29 @@ - + 至 - + 至 - - - - - - - - + + + + + + + + + + + + @@ -107,7 +119,7 @@ @@ -117,7 +129,7 @@ @@ -178,7 +190,9 @@ - + + + @@ -342,6 +356,7 @@ import { getMiniProgramTags, getWecomTags, getPurchaseChannel, + getRegionByPid, } from "@/api/system/member"; export default { @@ -360,7 +375,10 @@ export default { }], miniProgramTags: [], wecomTags: [], - purchaseChannel: null, + purchaseChannels: null, + provinceList: null, + cityList: null, + areaList: null, // 遮罩层 loading: true, // 选中数组 @@ -393,8 +411,8 @@ export default { nickname: null, headimg: null, username: null, - devicesNumStart: undefined, - devicesNumEnd: undefined, + deviceNumStart: undefined, + deviceNumEnd: undefined, creditStart: undefined, creditEnd: undefined, openid: null, @@ -424,7 +442,7 @@ export default { devicesTags: [], //仪器绑定标签 wecomTags:[], // 企微标签 miniProgramTags: [], // 小程序标签 - purchaseChannel: null, // 购买渠道 + purchaseChannels: [], // 购买渠道 }, // 表单参数 form: {}, @@ -440,6 +458,8 @@ export default { this.getList(); // 获取标签 this.getTags(); + // 获取省 + this.getProvinceList(); }, methods: { /** 查询用户列表 */ @@ -469,7 +489,27 @@ export default { }) // 购买渠道 getPurchaseChannel().then(Response => { - this.purchaseChannel = Response.data + this.purchaseChannels = Response.data + }) + }, + // 获取省市区 + getProvinceList() { + getRegionByPid(0).then(Response => { + this.provinceList = Response.data + }) + }, + getCityList(pid) { + console.log(pid); + getRegionByPid(pid).then(Response => { + console.log(Response.data) + this.cityList = Response.data + }) + }, + getAreaByPid(pid) { + console.log(pid); + getRegionByPid(pid).then(Response => { + console.log(Response.data) + this.areaList = Response.data }) }, // 取消按钮