通知详情修改

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -161,23 +161,21 @@ public class IndexModuleController {
             for(ProvinceDTO provinceDTO : serviceResponse.getResult()){
                 Map<String, Object> map = new HashMap<>();
                 map.put("key", provinceDTO.getProvinceName());
-                Map<String, Object> data = new HashMap<>();
-                data.put("mainStoreMemberCount", 0);
-                data.put("openStoreMemberCount", 0);
+                map.put("mainStoreMemberCount", 0);
+                map.put("openStoreMemberCount", 0);
                 for(StoreProvinceData storeProvinceData : dataResponse.getResult()){
                     if(provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())){
-                        data.put("mainStoreMemberCount", storeProvinceData.getMemberCount());
+                        map.put("mainStoreMemberCount", storeProvinceData.getMemberCount());
                     }
                 }
                 for(StoreProvinceData storeProvinceData : dataOpenStore.getResult()){
                     if(provinceDTO.getProvinceName().equals(storeProvinceData.getProvince())){
-                        data.put("openStoreMemberCount", storeProvinceData.getMemberCount());
+                        map.put("openStoreMemberCount", storeProvinceData.getMemberCount());
                     }
                 }
                 //查询门店数量
-                data.put("storeCount", this.getStoreNum(enterpriseId, null, provinceDTO.getProvinceId()));
-                data.put("onlineStoreCount", this.getStoreNum(enterpriseId, 1, provinceDTO.getProvinceId()));
-                map.put("data", data);
+                map.put("storeCount", this.getStoreNum(enterpriseId, null, provinceDTO.getProvinceId()));
+                map.put("onlineStoreCount", this.getStoreNum(enterpriseId, 1, provinceDTO.getProvinceId()));
                 result.add(map);
             }
         }
@@ -217,23 +215,21 @@ public class IndexModuleController {
                 if(cityDTO.getProvinceId().equals(provinceId)){
                     Map<String, Object> map = new HashMap<>();
                     map.put("key", cityDTO.getCityName());
-                    Map<String, Object> data = new HashMap<>();
-                    data.put("mainStoreMemberCount", 0);
-                    data.put("openStoreMemberCount", 0);
+                    map.put("mainStoreMemberCount", 0);
+                    map.put("openStoreMemberCount", 0);
                     for(StoreCityData storeCityData : dataResponse.getResult()){
                         if(cityDTO.getCityName().equals(storeCityData.getCity())){
-                            data.put("mainStoreMemberCount", storeCityData.getMemberCount());
+                            map.put("mainStoreMemberCount", storeCityData.getMemberCount());
                         }
                     }
                     for(StoreCityData storeCityData : dataOpenStore.getResult()){
                         if(cityDTO.getCityName().equals(storeCityData.getCity())){
-                            data.put("openStoreMemberCount", storeCityData.getMemberCount());
+                            map.put("openStoreMemberCount", storeCityData.getMemberCount());
                         }
                     }
                     //查询门店数量
-                    data.put("storeCount", this.getStoreNum(enterpriseId, null, provinceId, cityDTO.getCityId()));
-                    data.put("onlineStoreCount", this.getStoreNum(enterpriseId, 1, provinceId, cityDTO.getCityId()));
-                    map.put("data", data);
+                    map.put("storeCount", this.getStoreNum(enterpriseId, null, provinceId, cityDTO.getCityId()));
+                    map.put("onlineStoreCount", this.getStoreNum(enterpriseId, 1, provinceId, cityDTO.getCityId()));
                     result.add(map);
                 }
             }
@@ -349,6 +345,13 @@ public class IndexModuleController {
         return RestResponse.success(result);
     }
 
+    private void getLegend(Integer enterpriseId, String provinceId){
+        Integer storeNum = this.getStoreNum(enterpriseId, null, provinceId);
+
+        if(storeNum <=21){
+
+        }
+    }
 
     private Integer getStoreNum(Integer enterpriseId, Integer status, String provinceId){
         StoreSearchDTO storeSearchDTO = new StoreSearchDTO();