From c4b7de3165e2729d157907cf59ab8c4e6a2d4700 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 4 Dec 2024 14:29:00 +0800 Subject: [PATCH 1/2] fix GeoMapUtil --- .../src/main/java/com/cool/store/utils/GeoMapUtil.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java index b128df716..535b2d389 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java @@ -68,8 +68,14 @@ public class GeoMapUtil { // 根据实际响应结构解析省市区街道信息，此处仅为示例 String province = (String) addressComponent.get("province"); String city = addressComponent.get("city") instanceof String?(String) addressComponent.get("city"):province; - String district = (String) addressComponent.get("district"); - String township = (String) addressComponent.get("township"); + String district = ""; + String township = ""; + if (addressComponent.get("district") == null){ + district = (String) addressComponent.get("district"); + } + if (addressComponent.get("township") == null){ + township = (String) addressComponent.get("township"); + } String address = geoJson.getString("formatted_address"); return new AddressInfo(province, city, district, township, address); } From b2e35512dbf45a49033a39bc990950c8a5e71eb7 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 5 Dec 2024 18:23:57 +0800 Subject: [PATCH 2/2] fix GeoMapUtil --- .../src/main/java/com/cool/store/utils/GeoMapUtil.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java index 535b2d389..d117d1df0 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java @@ -68,14 +68,8 @@ public class GeoMapUtil { // 根据实际响应结构解析省市区街道信息，此处仅为示例 String province = (String) addressComponent.get("province"); String city = addressComponent.get("city") instanceof String?(String) addressComponent.get("city"):province; - String district = ""; - String township = ""; - if (addressComponent.get("district") == null){ - district = (String) addressComponent.get("district"); - } - if (addressComponent.get("township") == null){ - township = (String) addressComponent.get("township"); - } + String district = addressComponent.get("district") instanceof String?(String) addressComponent.get("district"):city; + String township =addressComponent.get("township") instanceof String?(String) addressComponent.get("township"):district; String address = geoJson.getString("formatted_address"); return new AddressInfo(province, city, district, township, address); }