微信代码自动生成

ruoyi-generator/src/test/java/com/ruoyi/generator/ApplicationTest.java

@@ -26,7 +26,8 @@ public class ApplicationTest {
     public void test2() {
         List<String> tableNames = Arrays.asList(
                 "ums_member",
-                "ums_member_address"
+                "ums_member_address",
+                "ums_member_wechat"
         );
         // 查询表信息
         List<GenTable> tableList = genTableService.selectGenTableByName(tableNames);

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

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

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;

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;
 

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")

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);

ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml

@@ -13,6 +13,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="avatar" column="avatar"/>
         <result property="gender" column="gender"/>
+        <result property="city" column="city"/>
+        <result property="province" column="province"/>
+        <result property="country" column="country"/>
+        <result property="remark" column="remark"/>
         <result property="birthday" column="birthday"/>
         <result property="spreadUid" column="spread_uid"/>
         <result property="spreadTime" column="spread_time"/>
@@ -23,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberVo">
-        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
     </sql>
 
     <select id="selectByEntity" parameterType="Member" resultMap="MemberResult">
@@ -36,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
             <if test="gender != null "> and gender = #{gender}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="country != null  and country != ''"> and country = #{country}</if>
             <if test="birthday != null "> and birthday = #{birthday}</if>
             <if test="spreadUid != null "> and spread_uid = #{spreadUid}</if>
             <if test="spreadTime != null "> and spread_time = #{spreadTime}</if>

sql/mall_ums结构.sql

@@ -45,8 +45,8 @@ CREATE TABLE `ums_member_address` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COMMENT='会员收货地址';
 
-DROP TABLE IF EXISTS `ums_wechat`;
+DROP TABLE IF EXISTS `ums_member_wechat`;
-CREATE TABLE `ums_wechat` (
+CREATE TABLE `ums_member_wechat` (
     `id` bigint(20) NOT NULL AUTO_INCREMENT,
     `member_id` bigint(20) DEFAULT NULL,
     `unionid` varchar(30) NULL COMMENT '只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段',