From a920a3899bff08da26bead7c591b4676255bfd3d Mon Sep 17 00:00:00 2001 From: zhaochencheng Date: Mon, 28 Nov 2022 12:06:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BB=A3=E7=A0=81=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/generator/ApplicationTest.java | 3 ++- .../ums/controller/MemberAddressController.java | 2 +- .../com/cyl/ums/controller/MemberController.java | 2 +- .../src/main/java/com/cyl/ums/domain/Member.java | 16 ++++++++++++++++ .../java/com/cyl/ums/pojo/query/MemberQuery.java | 9 +++++++++ .../main/java/com/cyl/ums/pojo/vo/MemberVO.java | 12 ++++++++++++ .../java/com/cyl/ums/service/MemberService.java | 12 ++++++++++++ .../main/resources/mapper/ums/MemberMapper.xml | 9 ++++++++- sql/mall_ums结构.sql | 4 ++-- 9 files changed, 63 insertions(+), 6 deletions(-) diff --git a/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java b/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java index cdde81b..f20dfb6 100644 --- a/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java +++ b/ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java @@ -26,7 +26,8 @@ public class ApplicationTest { public void test2() { List tableNames = Arrays.asList( "ums_member", - "ums_member_address" + "ums_member_address", + "ums_member_wechat" ); // 查询表信息 List tableList = genTableService.selectGenTableByName(tableNames); diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java index fc79c70..ca57062 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java @@ -31,7 +31,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; * 会员收货地址Controller * * @author zcc - * @date 2022-11-27 + * @date 2022-11-28 */ @Api(description ="会员收货地址接口列表") @RestController diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java index 6ec0978..746d3e6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java @@ -31,7 +31,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; * 会员信息Controller * * @author zcc - * @date 2022-11-27 + * @date 2022-11-28 */ @Api(description ="会员信息接口列表") @RestController diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java b/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java index 5143cdb..7139500 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java @@ -50,6 +50,22 @@ public class Member { @Excel(name = "性别：0->未知；1->男；2->女") private Integer gender; + @ApiModelProperty("用户所在城市") + @Excel(name = "用户所在城市") + private String city; + + @ApiModelProperty("用户所在省份") + @Excel(name = "用户所在省份") + private String province; + + @ApiModelProperty("用户所在国家") + @Excel(name = "用户所在国家") + private String country; + + @ApiModelProperty("公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注") + @Excel(name = "公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注") + private String remark; + @ApiModelProperty("生日") @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") private LocalDate birthday; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java index 424863b..7bcce38 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java @@ -36,6 +36,15 @@ public class MemberQuery { @ApiModelProperty("性别：0->未知；1->男；2->女 精确匹配") private Integer gender; + @ApiModelProperty("用户所在城市 精确匹配") + private String city; + + @ApiModelProperty("用户所在省份 精确匹配") + private String province; + + @ApiModelProperty("用户所在国家 精确匹配") + private String country; + @ApiModelProperty("生日 精确匹配") private LocalDate birthday; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java index 520d4b0..d6b5344 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java @@ -36,6 +36,18 @@ public class MemberVO { /** 性别：0->未知；1->男；2->女 */ @Excel(name = "性别：0->未知；1->男；2->女") private Integer gender; + /** 用户所在城市 */ + @Excel(name = "用户所在城市") + private String city; + /** 用户所在省份 */ + @Excel(name = "用户所在省份") + private String province; + /** 用户所在国家 */ + @Excel(name = "用户所在国家") + private String country; + /** 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 */ + @Excel(name = "公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注") + private String remark; /** 生日 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java index c934dc7..503106e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java @@ -79,6 +79,18 @@ public class MemberService { if (gender != null) { qw.eq("gender", gender); } + String city = query.getCity(); + if (!StringUtils.isEmpty(city)) { + qw.eq("city", city); + } + String province = query.getProvince(); + if (!StringUtils.isEmpty(province)) { + qw.eq("province", province); + } + String country = query.getCountry(); + if (!StringUtils.isEmpty(country)) { + qw.eq("country", country); + } LocalDate birthday = query.getBirthday(); if (birthday != null) { qw.eq("birthday", birthday); diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml index 2c672e6..871bb68 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml @@ -13,6 +13,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -23,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, nickname, password, phone, mark, status, avatar, gender, birthday, spread_uid, spread_time, level, integral, create_time, update_time from ums_member + select id, nickname, password, phone, mark, status, avatar, gender, city, province, country, remark, birthday, spread_uid, spread_time, level, integral, create_time, update_time from ums_member