省市区调整

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -8,8 +8,8 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.dict.api.dto.CityDTO;
 import com.gic.dict.api.dto.CountyDTO;
-import com.gic.dict.api.dto.GlobalDictMap;
 import com.gic.dict.api.dto.ProvinceDTO;
+import com.gic.dict.api.service.ManagerDictService;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.dto.StorePhotoDTO;
@@ -64,6 +64,8 @@ public class StoreController extends WebBaseController {
     private StaffApiService staffApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
+    @Autowired
+    private ManagerDictService managerDictService;
 
     /**
      * 好办小程序-绑定的门店列表
@@ -207,16 +209,17 @@ public class StoreController extends WebBaseController {
         List<ProvinceDTO> provinceList = new ArrayList<ProvinceDTO>();
         List<CityDTO> cityList = new ArrayList<CityDTO>();
         List<CountyDTO> countyList = new ArrayList<CountyDTO>();
+        Map<String, ProvinceDTO> provinceMap = managerDictService.getProvincesMap();
         switch (type) {
             // 省
             case 1:
-                for (String key : GlobalDictMap.provinceMap.keySet()) {
-                    provinceList.add(GlobalDictMap.provinceMap.get(key));
+                for (String key : provinceMap.keySet()) {
+                    provinceList.add(provinceMap.get(key));
                 }
                 return resultResponse(HaoBanErrCode.ERR_1, provinceList);
             // 市
             case 2:
-                Map<String, CityDTO> tabCityMap = GlobalDictMap.cityMap;
+                Map<String, CityDTO> tabCityMap = managerDictService.getCitysMap();
                 Map<String, CityDTO> cityMap = new HashMap<String, CityDTO>();
                 Set<Map.Entry<String, CityDTO>> citySet = tabCityMap.entrySet();
                 for (Map.Entry<String, CityDTO> entry : citySet) {
@@ -229,7 +232,7 @@ public class StoreController extends WebBaseController {
                 }
                 return resultResponse(HaoBanErrCode.ERR_1, cityList);
             case 3:
-                Map<String, CountyDTO> tabCountyMap = GlobalDictMap.countyMap;
+                Map<String, CountyDTO> tabCountyMap = managerDictService.getCountysMap();
                 Map<String, CountyDTO> countyMap = new HashMap<String, CountyDTO>();
                 Set<Map.Entry<String, CountyDTO>> tabSet = tabCountyMap.entrySet();
                 for (Map.Entry<String, CountyDTO> entry : tabSet) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java

@@ -20,9 +20,6 @@ public class MyApplicationContextAware implements ApplicationContextAware {
 
     @Override
     public void setApplicationContext(ApplicationContext appContext) throws BeansException {
-        GlobalDictMap.countyMap = managerDictService.getCountysMap();
-        GlobalDictMap.cityMap = managerDictService.getCitysMap();
-        GlobalDictMap.provinceMap = managerDictService.getProvincesMap();
         GlobalDictMap.dictMap = managerDictService.getDictList();
         GlobalDictMap.storeCategoryDictMap = managerDictService.getStoreCategoryDictList();
         log.info("数据字典放入缓存");