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(); 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());