release- 收货地址修改为省市区字符串+adcode

luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressAddDTO.java

@@ -33,8 +33,14 @@ public class UserinfoShippingAddressAddDTO implements Serializable {
     @ApiModelProperty(value = "区")
     String districtName;
 
-    @ApiModelProperty(value = "区域编码")
+    @ApiModelProperty(value = "省编码")
-    String adcode;
+    String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    String districtCode;
 
 
 }

luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressUpdateDTO.java

@@ -38,7 +38,13 @@ public class UserinfoShippingAddressUpdateDTO implements Serializable {
     @ApiModelProperty(value = "区")
     String districtName;
 
-    @ApiModelProperty(value = "区域编码")
+    @ApiModelProperty(value = "省编码")
-    String adcode;
+    String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    String districtCode;
 
 }

luoo_user/src/main/java/com/luoo/user/pojo/UserinfoShippingAddress.java

@@ -48,7 +48,13 @@ public class UserinfoShippingAddress extends JPABasePojo {
     @ApiModelProperty(value = "区")
     private String districtName;
 
-    @ApiModelProperty(value = "区域编码")
+    @ApiModelProperty(value = "省编码")
-    private String adcode;
+    private String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    private String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    private String districtCode;
 
 }

luoo_user/src/main/java/com/luoo/user/service/UserinfoShippingAddressService.java

@@ -63,7 +63,9 @@ public class UserinfoShippingAddressService {
                         qUserinfoShippingAddress.provinceName,
                         qUserinfoShippingAddress.cityName,
                         qUserinfoShippingAddress.districtName,
-                        qUserinfoShippingAddress.adcode
+                        qUserinfoShippingAddress.provinceCode,
+                        qUserinfoShippingAddress.cityCode,
+                        qUserinfoShippingAddress.districtCode
                 )).from(qUserinfoShippingAddress).
                 where(qUserinfoShippingAddress.userId.eq(user.getUserId()))
                 .fetch();

luoo_user/src/main/java/com/luoo/user/vo/userinfo/UserinfoShippingAddressAppVO.java

@@ -36,7 +36,13 @@ public class UserinfoShippingAddressAppVO implements Serializable {
     @ApiModelProperty(value = "区")
     String districtName;
 
-    @ApiModelProperty(value = "区域编码")
+    @ApiModelProperty(value = "省编码")
-    String adcode;
+    String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    String districtCode;
 
 }

luoo_user/src/main/resources/sql/20241103.sql

@@ -18,3 +18,15 @@ alter table tb_userinfo_shipping_address
 
 alter table tb_userinfo_shipping_address
     add adcode varchar(30) null comment '区域码';
+
+alter table tb_userinfo_shipping_address
+drop column adcode;
+
+alter table tb_userinfo_shipping_address
+    add province_code varchar(10) null comment '省编码';
+
+alter table tb_userinfo_shipping_address
+    add city_code varchar(10) null comment '市编码';
+
+alter table tb_userinfo_shipping_address
+    add district_code varchar(10) null comment '区编码';