|
@ -1331,19 +1331,37 @@ public class BmsSupplierController { |
|
|
if(StringUtils.hasText(a.getSalesRegionName())){ |
|
|
if(StringUtils.hasText(a.getSalesRegionName())){ |
|
|
BmsRegion saleRegion = saleRegionMap.get(a.getSalesRegionName()); |
|
|
BmsRegion saleRegion = saleRegionMap.get(a.getSalesRegionName()); |
|
|
supplier.setRegionLast(saleRegion.getId()); |
|
|
supplier.setRegionLast(saleRegion.getId()); |
|
|
supplier.setRegionSecond(saleRegion.getId()); |
|
|
String[] ids = saleRegion.getPathIds().split("_"); |
|
|
supplier.setRegionFirst(saleRegion.getPid()); |
|
|
supplier.setRegionFirst(ids[0]); |
|
|
|
|
|
if(ids.length>1){ |
|
|
|
|
|
supplier.setRegionSecond(ids[1]); |
|
|
|
|
|
}else { |
|
|
|
|
|
supplier.setRegionSecond("0"); |
|
|
|
|
|
} |
|
|
|
|
|
if(ids.length>2){ |
|
|
|
|
|
supplier.setRegionThird(ids[2]); |
|
|
|
|
|
}else { |
|
|
|
|
|
supplier.setRegionThird("0"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(StringUtils.hasText(a.getSecondaryLevelAdministrativeRegionName()) |
|
|
if(StringUtils.hasText(a.getSecondaryLevelAdministrativeRegionName()) |
|
|
&& StringUtils.hasText(a.getFirstLevelAdministrativeRegionName()) |
|
|
&& StringUtils.hasText(a.getFirstLevelAdministrativeRegionName()) |
|
|
&& StringUtils.hasText(a.getAdministrativeRegionName())){ |
|
|
&& StringUtils.hasText(a.getAdministrativeRegionName())){ |
|
|
BmsRegion2 bizRegion = bizRegionMap.get(a.getFirstLevelAdministrativeRegionName()+"_"+a.getSecondaryLevelAdministrativeRegionName()+"_"+a.getAdministrativeRegionName()); |
|
|
BmsRegion2 bizRegion = bizRegionMap.get(a.getFirstLevelAdministrativeRegionName()+"_"+a.getSecondaryLevelAdministrativeRegionName()+"_"+a.getAdministrativeRegionName()); |
|
|
supplier.setRegion2Third(bizRegion.getId()); |
|
|
|
|
|
supplier.setRegion2Second(bizRegion.getPid()); |
|
|
|
|
|
String firstRegion2Id = bizRegion.getPathIds().split("_")[0]; |
|
|
|
|
|
supplier.setRegion2First(firstRegion2Id); |
|
|
|
|
|
supplier.setRegion2Last(bizRegion.getId()); |
|
|
supplier.setRegion2Last(bizRegion.getId()); |
|
|
|
|
|
String[] ids = bizRegion.getPathIds().split("_"); |
|
|
|
|
|
supplier.setRegion2First(ids[0]); |
|
|
|
|
|
if(ids.length>1){ |
|
|
|
|
|
supplier.setRegion2Second(ids[1]); |
|
|
|
|
|
}else { |
|
|
|
|
|
supplier.setRegion2Second("0"); |
|
|
|
|
|
} |
|
|
|
|
|
if(ids.length>2){ |
|
|
|
|
|
supplier.setRegion2Third(ids[2]); |
|
|
|
|
|
}else { |
|
|
|
|
|
supplier.setRegion2Third("0"); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return supplier; |
|
|
return supplier; |
|
|