BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/liu-jiangs-project/RuoYi-Vue

pull/1121/head
liujiang 2025-11-28 16:16:27 +08:00
parent 32e1cc2e70 b0898c2e7c
commit 993e039d47
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java
View File

@ -203,7 +203,12 @@ public class ExpressServiceImpl implements IExpressService {
List<ExpressRegionTreeNodeDTO> treeNodeList = redisCache.getCacheList(Constants.EXPRESS_REGION_TREE_CACHE_KEY);
if (CollUtil.isEmpty(treeNodeList)) {
List<ExpressRegionDTO> 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<ExpressRegionTreeNodeDTO> list = BeanUtil.copyToList(dtoList, ExpressRegionTreeNodeDTO.class);
treeNodeList = CollUtil.newArrayList();

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/UserAddressServiceImpl.java
View File

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