From 484b07f54640e1937a592844e1784f847674e48a Mon Sep 17 00:00:00 2001
From: huangyw <1207046171@qq.com>
Date: Sun, 3 Nov 2024 20:30:52 +0800
Subject: [PATCH] =?UTF-8?q?release-=20=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=9C=81=E5=B8=82=E5=8C=BA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2+adcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../userinfo/UserinfoShippingAddressAddDTO.java    | 10 ++++++++--
 .../userinfo/UserinfoShippingAddressUpdateDTO.java | 10 ++++++++--
 .../luoo/user/pojo/UserinfoShippingAddress.java    | 10 ++++++++--
 .../service/UserinfoShippingAddressService.java    |  4 +++-
 .../vo/userinfo/UserinfoShippingAddressAppVO.java  | 10 ++++++++--
 luoo_user/src/main/resources/sql/20241103.sql      | 14 +++++++++++++-
 6 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressAddDTO.java b/luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressAddDTO.java
index b92a79d..0e56d98 100644
--- a/luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressAddDTO.java
+++ b/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 = "区域编码")
-    String adcode;
+    @ApiModelProperty(value = "省编码")
+    String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    String districtCode;
 
 
 }
\ No newline at end of file
diff --git a/luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressUpdateDTO.java b/luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressUpdateDTO.java
index 88b455c..c971ea1 100644
--- a/luoo_user/src/main/java/com/luoo/user/dto/userinfo/UserinfoShippingAddressUpdateDTO.java
+++ b/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 = "区域编码")
-    String adcode;
+    @ApiModelProperty(value = "省编码")
+    String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    String districtCode;
 
 }
\ No newline at end of file
diff --git a/luoo_user/src/main/java/com/luoo/user/pojo/UserinfoShippingAddress.java b/luoo_user/src/main/java/com/luoo/user/pojo/UserinfoShippingAddress.java
index d5abdc8..114e449 100644
--- a/luoo_user/src/main/java/com/luoo/user/pojo/UserinfoShippingAddress.java
+++ b/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 = "区域编码")
-    private String adcode;
+    @ApiModelProperty(value = "省编码")
+    private String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    private String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    private String districtCode;
 
 }
diff --git a/luoo_user/src/main/java/com/luoo/user/service/UserinfoShippingAddressService.java b/luoo_user/src/main/java/com/luoo/user/service/UserinfoShippingAddressService.java
index 4d359f5..ca09889 100644
--- a/luoo_user/src/main/java/com/luoo/user/service/UserinfoShippingAddressService.java
+++ b/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();
diff --git a/luoo_user/src/main/java/com/luoo/user/vo/userinfo/UserinfoShippingAddressAppVO.java b/luoo_user/src/main/java/com/luoo/user/vo/userinfo/UserinfoShippingAddressAppVO.java
index 497c69f..0b9ea7f 100644
--- a/luoo_user/src/main/java/com/luoo/user/vo/userinfo/UserinfoShippingAddressAppVO.java
+++ b/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 = "区域编码")
-    String adcode;
+    @ApiModelProperty(value = "省编码")
+    String provinceCode;
+
+    @ApiModelProperty(value = "市编码")
+    String cityCode;
+
+    @ApiModelProperty(value = "区编码")
+    String districtCode;
 
 }
diff --git a/luoo_user/src/main/resources/sql/20241103.sql b/luoo_user/src/main/resources/sql/20241103.sql
index c501da6..a6165e2 100644
--- a/luoo_user/src/main/resources/sql/20241103.sql
+++ b/luoo_user/src/main/resources/sql/20241103.sql
@@ -17,4 +17,16 @@ alter table tb_userinfo_shipping_address
     add district_name varchar(30) null comment '区';
 
 alter table tb_userinfo_shipping_address
-    add adcode varchar(30) null comment '区域码';
\ No newline at end of file
+    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 '区编码';
\ No newline at end of file