Commit 6050c2e1 by huangZW

111

parent 006096c8
......@@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -22,6 +23,10 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.clerk.api.dto.ClerkDTO;
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.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.dto.StorePhotoDTO;
import com.gic.enterprise.api.service.StoreService;
......@@ -171,7 +176,30 @@ public class StoreController extends WebBaseController{
HaobanDataDTO HaobanDataDTO = haobanDataApiService.getSaleDataByDate(enterpriseId, storeId, date);
return resultResponse(HaoBanErrCode.ERR_1,HaobanDataDTO);
}
//获取首页销售数据
@RequestMapping("/get-area-list")
public HaobanResponse getArea() {
Map<String,Object> map = new HashMap<>();
Map<String, ProvinceDTO> provinceMap = GlobalDictMap.provinceMap;
Map<String,CityDTO> cityMap = GlobalDictMap.cityMap;
Map<String,CountyDTO> countyMap = GlobalDictMap.countyMap;
List<ProvinceDTO> provinceList=new ArrayList<ProvinceDTO>();
List<CityDTO> cityList=new ArrayList<CityDTO>();
List<CountyDTO>countyList=new ArrayList<CountyDTO>();
for (String key : provinceMap.keySet()) {
provinceList.add(provinceMap.get(key));
}
for (String key : cityMap.keySet()) {
cityList.add(cityMap.get(key));
}
for (String key : countyMap.keySet()) {
countyList.add(countyMap.get(key));
}
map.put("province", provinceList);
map.put("city", cityList);
map.put("county", countyList);
return resultResponse(HaoBanErrCode.ERR_1,map);
}
//获取首页销售数据
@RequestMapping("/change-store-detail")
public HaobanResponse saleDate(String wxEnterpriseId,String storeId,String staffId,String changeField,String oldValue,String newValue) {
......
......@@ -3,17 +3,31 @@ package com.gic.haoban.manage.web.init;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
import com.gic.dict.api.dto.GlobalDictMap;
import com.gic.dict.api.service.ManagerDictService;
@Component
public class MyApplicationContextAware implements ApplicationContextAware {
private Logger log = LogManager.getLogger(MyApplicationContextAware.class);
private static ApplicationContext applicationContext;
@Autowired
private ManagerDictService managerDictService;
@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("数据字典放入缓存");
}
}
......@@ -31,6 +31,7 @@
<dubbo:reference interface="com.gic.haoban.manage.api.service.BindApiService" id="bindApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditApiService" id="auditApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditSettingApiService" id="auditSettingApiService"/>
<dubbo:reference interface="com.gic.dict.api.service.ManagerDictService" id="managerDictService"/>
<dubbo:reference interface="com.gic.haoban.communicate.api.service.valid.ValidationCodeService" id="validationCodeService"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment