diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantStoreController.java b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantStoreController.java index 709420ff..309d3eb0 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantStoreController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantStoreController.java @@ -109,14 +109,8 @@ public class HighMerchantStoreController { } Map regionMap = commonService.getParentInfoByRegionId(highMerchantStore.getRegionId()); - // 如果是重庆市的区县,使用重庆市的区域代码 - if (regionMap.get("city").getRegionId().intValue() == 500000) { - highMerchantStore.setRegionId(regionMap.get("city").getRegionId()); - highMerchantStore.setRegionName(regionMap.get("city").getRegionName()); - - } else { - highMerchantStore.setRegionName(commonService.getRegionsById(highMerchantStore.getRegionId()).getRegionName()); - } + highMerchantStore.setRegionId(regionMap.get("city").getRegionId()); + highMerchantStore.setRegionName(regionMap.get("city").getRegionName()); highMerchantStore.setCreateTime(new Date()); highMerchantStore.setUpdateTime(new Date()); highMerchantStore.setStatus(1); // 状态:0:删除,1:正常 @@ -188,14 +182,8 @@ public class HighMerchantStoreController { } Map regionMap = commonService.getParentInfoByRegionId(highMerchantStore.getRegionId()); - // 如果是重庆市的区县,使用重庆市的区域代码 - if (regionMap.get("city").getRegionId().intValue() == 500000) { - highMerchantStore.setRegionId(regionMap.get("city").getRegionId()); - highMerchantStore.setRegionName(regionMap.get("city").getRegionName()); - - } else { - highMerchantStore.setRegionName(commonService.getRegionsById(highMerchantStore.getRegionId()).getRegionName()); - } + highMerchantStore.setRegionId(regionMap.get("city").getRegionId()); + highMerchantStore.setRegionName(regionMap.get("city").getRegionName()); highMerchantStore.setUpdateTime(new Date()); highMerchantStore.setOperatorId(userInfoModel.getSecUser().getId()); highMerchantStore.setOperatorName(userInfoModel.getSecUser().getUserName());