update:地址处理修复

fengliang
1 parent a4366834
Showing 1 changed file with 6 additions and 20 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/BaseRegionServiceImpl.java
@@ -82,29 +82,15 @@ public class BaseRegionServiceImpl implements BaseRegionService {
             streetList.add(street);
             lastBaseRegion = baseRegion;
         }
-        if(baseDistrict!=null){
-            baseDistrict.setChildren(streetList);
-
-        }else{
-            baseDistrict = new BaseRegionNextVo(lastBaseRegion.getDistrictId(), lastBaseRegion.getDistrictName(),3);
-            baseDistrict.setChildren(streetList);
-        }
+        baseDistrict = new BaseRegionNextVo(lastBaseRegion.getDistrictId(), lastBaseRegion.getDistrictName(),3);
+        baseDistrict.setChildren(streetList);
         districtsMap.put(baseDistrict.getId(),baseDistrict);
-        if(baseCity!=null){
-            baseCity.setChildren(new ArrayList<>(districtsMap.values()));
-        }else{
-            baseCity = new BaseRegionNextVo(lastBaseRegion.getCityId(), lastBaseRegion.getCityName(),2);
-            baseCity.setChildren(new ArrayList<>(districtsMap.values()));
-        }
+        baseCity = new BaseRegionNextVo(lastBaseRegion.getCityId(), lastBaseRegion.getCityName(),2);
+        baseCity.setChildren(new ArrayList<>(districtsMap.values()));
         citiesMap.put(baseCity.getId(),baseCity);
-        if(baseProvince!=null){
-            baseProvince.setChildren(new ArrayList<>(citiesMap.values()));
-        }else{
-            baseProvince = new BaseRegionNextVo(lastBaseRegion.getProvinceId(), lastBaseRegion.getProvinceName(),1);
-            baseProvince.setChildren(new ArrayList<>(citiesMap.values()));
-        }
+        baseProvince = new BaseRegionNextVo(lastBaseRegion.getProvinceId(), lastBaseRegion.getProvinceName(),1);
+        baseProvince.setChildren(new ArrayList<>(citiesMap.values()));
         provinces.add(baseProvince);
-
         return provinces;
     }