From 3a947f8f54b9c4a8d7ff3f3216bd9cc4ade2bd6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Fri, 28 Nov 2025 16:00:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?= =?UTF-8?q?=E6=A0=91=E4=B8=8D=E8=BF=94=E5=9B=9E=E6=B8=AF=E6=BE=B3=E5=8F=B0?= =?UTF-8?q?=E5=8F=8A=E6=B5=B7=E5=A4=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/xkt/service/impl/ExpressServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java index 55c67b081..c5e2ecdef 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java @@ -203,7 +203,12 @@ public class ExpressServiceImpl implements IExpressService { List treeNodeList = redisCache.getCacheList(Constants.EXPRESS_REGION_TREE_CACHE_KEY); if (CollUtil.isEmpty(treeNodeList)) { List dtoList = getRegionListCache().stream() - .filter(o -> Constants.UNDELETED.equals(o.getDelFlag())) + .filter(o -> Constants.UNDELETED.equals(o.getDelFlag()) + //排除港澳台及海外 + && !StrUtil.startWith(o.getRegionCode(), "71") + && !StrUtil.startWith(o.getRegionCode(), "81") + && !StrUtil.startWith(o.getRegionCode(), "82") + && !StrUtil.startWith(o.getRegionCode(), "99")) .collect(Collectors.toList()); List list = BeanUtil.copyToList(dtoList, ExpressRegionTreeNodeDTO.class); treeNodeList = CollUtil.newArrayList(); From b0898c2e7c1f11f92fc545fc4d1c790336952f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Fri, 28 Nov 2025 16:03:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/xkt/service/impl/UserAddressServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAddressServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAddressServiceImpl.java index 808ada839..666ae44ff 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAddressServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAddressServiceImpl.java @@ -52,7 +52,7 @@ public class UserAddressServiceImpl implements IUserAddressService { Assert.notEmpty(structAddressDTO.getCityName(), "市名称异常"); Assert.notEmpty(structAddressDTO.getCountyCode(), "区县编码异常"); Assert.notEmpty(structAddressDTO.getCountyName(), "区县名称异常"); - Assert.notEmpty(structAddressDTO.getDetailAddress(), "详细地址异常"); + Assert.notEmpty(structAddressDTO.getDetailAddress(), "地址数据异常，请检查并修改！"); userAddress.setProvinceCode(structAddressDTO.getProvinceCode()); userAddress.setCityCode(structAddressDTO.getCityCode()); userAddress.setDistrictCode(structAddressDTO.getCountyCode());