From ba672e2101fb14c53645d685662f5a2285f4fcb4 Mon Sep 17 00:00:00 2001 From: 199901012 Date: Wed, 24 Mar 2021 11:42:22 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HighMerchantStoreController.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) 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());