会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/account/domain/BizMemberAddress.java

@@ -17,11 +17,11 @@ public class BizMemberAddress extends BaseEntity
 
     private String mobile;
 
-    private String province;
+    /** 省市区编码（区县级 code） */
+    private String regionCode;
 
-    private String city;
-
-    private String district;
+    /** 省市区名称（省/市/区 / 拼接） */
+    private String regionName;
 
     private String detailAddress;
 
@@ -69,34 +69,24 @@ public class BizMemberAddress extends BaseEntity
         this.mobile = mobile;
     }
 
-    public String getProvince()
-    {
-        return province;
-    }
-
-    public void setProvince(String province)
-    {
-        this.province = province;
-    }
-
-    public String getCity()
+    public String getRegionCode()
     {
-        return city;
+        return regionCode;
     }
 
-    public void setCity(String city)
+    public void setRegionCode(String regionCode)
     {
-        this.city = city;
+        this.regionCode = regionCode;
     }
 
-    public String getDistrict()
+    public String getRegionName()
     {
-        return district;
+        return regionName;
     }
 
-    public void setDistrict(String district)
+    public void setRegionName(String regionName)
     {
-        this.district = district;
+        this.regionName = regionName;
     }
 
     public String getDetailAddress()

baqing-shop/src/main/java/com/ruoyi/web/modules/account/service/impl/MemberAddressServiceImpl.java

@@ -105,6 +105,10 @@ public class MemberAddressServiceImpl implements IMemberAddressService
         {
             throw new ServiceException("请输入联系电话");
         }
+        if (StringUtils.isEmpty(address.getRegionCode()) || StringUtils.isEmpty(address.getRegionName()))
+        {
+            throw new ServiceException("请选择所在地区");
+        }
         if (StringUtils.isEmpty(address.getDetailAddress()))
         {
             throw new ServiceException("请输入详细地址");
@@ -117,12 +121,17 @@ public class MemberAddressServiceImpl implements IMemberAddressService
         vo.setAddressId(addr.getAddressId());
         vo.setConsigneeName(addr.getConsigneeName());
         vo.setMobile(addr.getMobile());
-        vo.setProvince(addr.getProvince());
-        vo.setCity(addr.getCity());
-        vo.setDistrict(addr.getDistrict());
+        vo.setRegionCode(addr.getRegionCode());
+        vo.setRegionName(addr.getRegionName());
         vo.setDetailAddress(addr.getDetailAddress());
         vo.setIsDefault(addr.getIsDefault());
-        vo.setFullAddress(addr.getProvince() + addr.getCity() + addr.getDistrict() + addr.getDetailAddress());
+        vo.setFullAddress(buildFullAddress(addr.getRegionName(), addr.getDetailAddress()));
         return vo;
     }
+
+    private String buildFullAddress(String regionName, String detailAddress)
+    {
+        String region = StringUtils.isEmpty(regionName) ? "" : regionName.replace("/", "");
+        return region + (detailAddress != null ? detailAddress : "");
+    }
 }

baqing-shop/src/main/java/com/ruoyi/web/modules/account/service/impl/MemberServiceImpl.java

@@ -247,12 +247,17 @@ public class MemberServiceImpl implements IMemberService
         vo.setAddressId(addr.getAddressId());
         vo.setConsigneeName(addr.getConsigneeName());
         vo.setMobile(addr.getMobile());
-        vo.setProvince(addr.getProvince());
-        vo.setCity(addr.getCity());
-        vo.setDistrict(addr.getDistrict());
+        vo.setRegionCode(addr.getRegionCode());
+        vo.setRegionName(addr.getRegionName());
         vo.setDetailAddress(addr.getDetailAddress());
         vo.setIsDefault(addr.getIsDefault());
-        vo.setFullAddress(addr.getProvince() + addr.getCity() + addr.getDistrict() + addr.getDetailAddress());
+        vo.setFullAddress(buildFullAddress(addr.getRegionName(), addr.getDetailAddress()));
         return vo;
     }
+
+    private String buildFullAddress(String regionName, String detailAddress)
+    {
+        String region = StringUtils.isEmpty(regionName) ? "" : regionName.replace("/", "");
+        return region + (detailAddress != null ? detailAddress : "");
+    }
 }

baqing-shop/src/main/java/com/ruoyi/web/modules/account/vo/MemberAddressVO.java

@@ -11,11 +11,11 @@ public class MemberAddressVO
 
     private String mobile;
 
-    private String province;
+    /** 省市区编码（区县级 code） */
+    private String regionCode;
 
-    private String city;
-
-    private String district;
+    /** 省市区名称（省/市/区 / 拼接） */
+    private String regionName;
 
     private String detailAddress;
 
@@ -53,34 +53,24 @@ public class MemberAddressVO
         this.mobile = mobile;
     }
 
-    public String getProvince()
-    {
-        return province;
-    }
-
-    public void setProvince(String province)
-    {
-        this.province = province;
-    }
-
-    public String getCity()
+    public String getRegionCode()
     {
-        return city;
+        return regionCode;
     }
 
-    public void setCity(String city)
+    public void setRegionCode(String regionCode)
     {
-        this.city = city;
+        this.regionCode = regionCode;
     }
 
-    public String getDistrict()
+    public String getRegionName()
     {
-        return district;
+        return regionName;
     }
 
-    public void setDistrict(String district)
+    public void setRegionName(String regionName)
     {
-        this.district = district;
+        this.regionName = regionName;
     }
 
     public String getDetailAddress()

baqing-shop/src/main/resources/mapper/account/BizMemberAddressMapper.xml

@@ -7,9 +7,8 @@
         <result property="memberId" column="member_id"/>
         <result property="consigneeName" column="consignee_name"/>
         <result property="mobile" column="mobile"/>
-        <result property="province" column="province"/>
-        <result property="city" column="city"/>
-        <result property="district" column="district"/>
+        <result property="regionCode" column="region_code"/>
+        <result property="regionName" column="region_name"/>
         <result property="detailAddress" column="detail_address"/>
         <result property="isDefault" column="is_default"/>
         <result property="delFlag" column="del_flag"/>
@@ -18,14 +17,14 @@
     </resultMap>
 
     <select id="selectById" resultMap="BizMemberAddressResult">
-        select address_id, member_id, consignee_name, mobile, province, city, district,
+        select address_id, member_id, consignee_name, mobile, region_code, region_name,
                detail_address, is_default, del_flag, create_time, update_time
         from biz_member_address
         where address_id = #{addressId} and member_id = #{memberId} and del_flag = '0'
     </select>
 
     <select id="selectByMemberId" resultMap="BizMemberAddressResult">
-        select address_id, member_id, consignee_name, mobile, province, city, district,
+        select address_id, member_id, consignee_name, mobile, region_code, region_name,
                detail_address, is_default, del_flag, create_time, update_time
         from biz_member_address
         where member_id = #{memberId} and del_flag = '0'
@@ -34,10 +33,10 @@
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="addressId">
         insert into biz_member_address (
-            member_id, consignee_name, mobile, province, city, district, detail_address,
+            member_id, consignee_name, mobile, region_code, region_name, detail_address,
             is_default, del_flag, create_time, update_time
         ) values (
-            #{memberId}, #{consigneeName}, #{mobile}, #{province}, #{city}, #{district}, #{detailAddress},
+            #{memberId}, #{consigneeName}, #{mobile}, #{regionCode}, #{regionName}, #{detailAddress},
             #{isDefault}, '0', sysdate(), sysdate()
         )
     </insert>
@@ -47,9 +46,8 @@
         <set>
             <if test="consigneeName != null">consignee_name = #{consigneeName},</if>
             <if test="mobile != null">mobile = #{mobile},</if>
-            <if test="province != null">province = #{province},</if>
-            <if test="city != null">city = #{city},</if>
-            <if test="district != null">district = #{district},</if>
+            <if test="regionCode != null">region_code = #{regionCode},</if>
+            <if test="regionName != null">region_name = #{regionName},</if>
             <if test="detailAddress != null">detail_address = #{detailAddress},</if>
             <if test="isDefault != null">is_default = #{isDefault},</if>
             update_time = sysdate()

baqing-shop/src/test/java/com/ruoyi/web/modules/account/service/MemberAddressServiceImplTest.java

@@ -40,6 +40,8 @@ class MemberAddressServiceImplTest
         BizMemberAddress addr = new BizMemberAddress();
         addr.setConsigneeName("张三");
         addr.setMobile("17700001111");
+        addr.setRegionCode("110101");
+        addr.setRegionName("北京市/市辖区/东城区");
         addr.setDetailAddress("详细地址");
         addr.setIsDefault(MemberConstants.DEFAULT_YES);
 

doc/平台后台/会员管理/会员管理技术方案.md

@@ -142,9 +142,8 @@ sys_user（账号：user_name/phonenumber/nick_name/password/avatar/status）
 | member_id | bigint | FK |
 | consignee_name | varchar(64) | 收货人 |
 | mobile | varchar(20) | 联系电话 |
-| province | varchar(32) | 省 |
-| city | varchar(32) | 市 |
-| district | varchar(32) | 区 |
+| region_code | varchar(64) | 省市区编码（区县级 code） |
+| region_name | varchar(128) | 省市区名称（省/市/区 / 拼接） |
 | detail_address | varchar(256) | 详细地址 |
 | is_default | char(1) | 0 否 1 是；每会员至多一条默认 |
 | del_flag | char(1) | 0 存在 2 删除 |
@@ -270,9 +269,8 @@ CREATE TABLE `biz_member` (
       "addressId": 10,
       "consigneeName": "张三",
       "mobile": "17712349136",
-      "province": "西藏自治区",
-      "city": "那曲市",
-      "district": "比如县",
+      "regionCode": "540622",
+      "regionName": "西藏自治区/那曲市/比如县",
       "detailAddress": "某某路1号",
       "isDefault": "1",
       "fullAddress": "西藏自治区那曲市比如县某某路1号"
@@ -451,4 +449,4 @@ WHERE member_id = #{memberId} AND order_status = '3' AND del_flag = '0'
 
 ---
 
-*文档版本：v1.3 · MySQL 5.7.39 · RuoYi v3.9.2-springboot2 · C 端注册/登录见《消费者APP/会员注册登录/会员注册登录技术方案.md》v1.2 · 关联《会员管理功能需求.md》v1.1、《会员管理测试用例.md》v1.1*
+*文档版本：v1.4 · MySQL 5.7.39 · RuoYi v3.9.2-springboot2 · 地址表 `region_code`/`region_name` · C 端注册/登录见《消费者APP/会员注册登录/会员注册登录技术方案.md》v1.2 · 关联《会员管理功能需求.md》v1.1、《会员管理测试用例.md》v1.1*

doc/消费者APP/我的服务/我的服务前端技术方案.md

@@ -99,7 +99,7 @@
 
 **密码 Body：** `oldPassword`、`newPassword`、`confirmPassword`。
 
-**地址 Body：** `consigneeName`、`mobile`、`province`、`city`、`district`、`detailAddress`、`isDefault`（`0`/`1`）。
+**地址 Body：** `consigneeName`、`mobile`、`regionCode`、`regionName`、`detailAddress`、`isDefault`（`0`/`1`）。
 
 ### 4.2 入驻 `/api/merchant/entry`
 
@@ -155,7 +155,7 @@
 | MS-A1～A4 | 地址默认互斥、删除确认 |
 | MS-E5～E9 | 协议勾选、阻塞待审、提交确认 |
 
-**地区：** 手填省/市/区生成 `bizRegionCode` / `bizRegionName`；后续可接级联字典。
+**地区：** `regionCode` = 区县 `code`；`regionName` = 省/市/区 `/` 拼接（与商户 `biz_region_*` 一致）；UI 暂用手填三栏，后续可接 `GET /api/region/tree` 级联。
 
 ---
 

doc/消费者APP/我的服务/我的服务技术方案.md

@@ -123,7 +123,8 @@ Header：`Authorization: Bearer {token}`（与平台 `TokenService` 一致）。
 | member_id | bigint | FK → `biz_member.member_id` |
 | consignee_name | varchar(64) | 收货人 |
 | mobile | varchar(20) | 联系电话 |
-| province / city / district | varchar(32) | 省市区 |
+| region_code | varchar(64) | 省市区编码（区县级 code） |
+| region_name | varchar(128) | 省市区名称（省/市/区 / 拼接） |
 | detail_address | varchar(256) | 详细地址 |
 | is_default | char(1) | **0** 否 **1** 是；同会员 **至多一条** 为 1 |
 | del_flag | char(1) | **0** 存在 **2** 逻辑删除 |
@@ -259,9 +260,9 @@ sys_user ──1:1── biz_member ──1:N── biz_member_address
 |------|------|
 | addressId | |
 | consigneeName、mobile | |
-| province、city、district、detailAddress | |
+| regionCode、regionName、detailAddress | |
 | isDefault | 0/1 |
-| fullAddress | 省+市+区+详细（拼接） |
+| fullAddress | regionName（去 `/`）+ 详细地址 |
 
 #### `POST /api/member/address` / `PUT /api/member/address`
 
@@ -269,7 +270,7 @@ sys_user ──1:1── biz_member ──1:N── biz_member_address
 |-----------|:----:|
 | addressId | PUT 必填 |
 | consigneeName、mobile | 是 |
-| province、city、district | 是 |
+| regionCode、regionName | 是；须 **成对** 非空 |
 | detailAddress | 是 |
 | isDefault | 否；为 1 时 **同事务** `clearDefault` |
 
@@ -465,10 +466,11 @@ submitApply(memberId, dto)
 
 | 版本 | 说明 |
 |------|------|
+| **v1.3** | `biz_member_address`：`province/city/district` → **`region_code`/`region_name`** |
 | **v1.2** | 移除 **birthday**（个人资料不含出生日期） |
 | **v1.1** | email/sex 存 **sys_user**；`PUT /password`；`MemberProfileAppVO` |
 | **v1.0** | 首版 |
 
 ---
 
-*文档版本：v1.2 · MySQL 5.7.39 · RuoYi v3.9.2-springboot2 · 关联《我的服务功能需求.md》v1.1*
+*文档版本：v1.3 · MySQL 5.7.39 · RuoYi v3.9.2-springboot2 · 关联《我的服务功能需求.md》v1.1*

sql/biz_member.sql

@@ -25,9 +25,8 @@ CREATE TABLE IF NOT EXISTS `biz_member_address` (
   `member_id` bigint(20) NOT NULL COMMENT '会员ID（biz_member.member_id = sys_user.user_id）',
   `consignee_name` varchar(64) NOT NULL COMMENT '收货人姓名',
   `mobile` varchar(20) NOT NULL COMMENT '收货联系电话',
-  `province` varchar(32) NOT NULL DEFAULT '' COMMENT '省',
-  `city` varchar(32) NOT NULL DEFAULT '' COMMENT '市',
-  `district` varchar(32) NOT NULL DEFAULT '' COMMENT '区/县',
+  `region_code` varchar(64) NOT NULL DEFAULT '' COMMENT '省市区编码（区县级 code）',
+  `region_name` varchar(128) NOT NULL DEFAULT '' COMMENT '省市区名称（省/市/区 / 拼接）',
   `detail_address` varchar(256) NOT NULL COMMENT '详细地址',
   `is_default` char(1) NOT NULL DEFAULT '0' COMMENT '是否默认地址：0否 1是',
   `del_flag` char(1) NOT NULL DEFAULT '0' COMMENT '删除标志：0存在 2逻辑删除',