Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-bweb/src/main/java/com/bweb/controller/HighMerchantStoreController.java

@@ -109,14 +109,8 @@ public class HighMerchantStoreController {
             }
 
             Map<String, SecRegion> regionMap = commonService.getParentInfoByRegionId(highMerchantStore.getRegionId());
-            // 如果是重庆市的区县，使用重庆市的区域代码
+            highMerchantStore.setRegionId(regionMap.get("city").getRegionId());
-            if (regionMap.get("city").getRegionId().intValue() == 500000) {
+            highMerchantStore.setRegionName(regionMap.get("city").getRegionName());
-                highMerchantStore.setRegionId(regionMap.get("city").getRegionId());
-                highMerchantStore.setRegionName(regionMap.get("city").getRegionName());
-
-            } else {
-                highMerchantStore.setRegionName(commonService.getRegionsById(highMerchantStore.getRegionId()).getRegionName());
-            }
             highMerchantStore.setCreateTime(new Date());
             highMerchantStore.setUpdateTime(new Date());
             highMerchantStore.setStatus(1); // 状态：0：删除，1：正常
@@ -188,14 +182,8 @@ public class HighMerchantStoreController {
             }
 
             Map<String, SecRegion> regionMap = commonService.getParentInfoByRegionId(highMerchantStore.getRegionId());
-            // 如果是重庆市的区县，使用重庆市的区域代码
+            highMerchantStore.setRegionId(regionMap.get("city").getRegionId());
-            if (regionMap.get("city").getRegionId().intValue() == 500000) {
+            highMerchantStore.setRegionName(regionMap.get("city").getRegionName());
-                highMerchantStore.setRegionId(regionMap.get("city").getRegionId());
-                highMerchantStore.setRegionName(regionMap.get("city").getRegionName());
-
-            } else {
-                highMerchantStore.setRegionName(commonService.getRegionsById(highMerchantStore.getRegionId()).getRegionName());
-            }
             highMerchantStore.setUpdateTime(new Date());
             highMerchantStore.setOperatorId(userInfoModel.getSecUser().getId());
             highMerchantStore.setOperatorName(userInfoModel.getSecUser().getUserName());