Merge branch 'developer' into 'master'

Developer

See merge request !7

gic-store-api/src/main/java/com/gic/store/dto/StoreEsDTO.java

@@ -34,6 +34,7 @@ public class StoreEsDTO implements Serializable {
     private String address;
     private Double score;
     private Integer evaluateCount;
+    private String conactsPhone;
 
     public Integer getStoreId() {
         return storeId;
@@ -274,4 +275,12 @@ public class StoreEsDTO implements Serializable {
     public Integer getEvaluateCount() {
         return evaluateCount;
     }
+
+    public void setConactsPhone(String conactsPhone) {
+        this.conactsPhone = conactsPhone;
+    }
+
+    public String getConactsPhone() {
+        return conactsPhone;
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ProvincesApiServiceImpl.java

@@ -55,11 +55,13 @@ public class ProvincesApiServiceImpl implements ProvincesApiService {
             list = EntityUtil.changeEntityListByJSON(CityDTO.class, this.provincesService.selectAllCity());
             RedisUtil.setCache(key, list, 6*30l, TimeUnit.DAYS);
         }
+        log.info("allcity:{}", list.size());
         return ServiceResponse.success(list);
     }
 
     @Override
     public ServiceResponse<CityDTO> getCityByCityId(String cityId) {
+        log.info("获取城市信息:{}", cityId);
         ServiceResponse<List<CityDTO>> response = this.selectAllCity();
         if(response.isSuccess() && CollectionUtils.isNotEmpty(response.getResult())){
             List<CityDTO> list = response.getResult();

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -1234,6 +1234,7 @@ public class StoreApiServiceImpl implements StoreApiService {
             esDTO.setAddress(dto.getAddress());
             esDTO.setScore(dto.getScore());
             esDTO.setEvaluateCount(dto.getEvaluateCount());
+            esDTO.setConactsPhone(dto.getConactsPhone());
             Double[] location = {Double.valueOf(StringUtils.isBlank(dto.getLongitude())? "0" : dto.getLongitude()),Double.valueOf(StringUtils.isBlank(dto.getLatitude())? "0":dto.getLatitude())};
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(esDTO));
             jsonObject.put("location", location);

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -121,7 +121,7 @@ public class StoreController extends DownloadUtils {
         storeDTO.setRemark(storeQO.getStoreId() == null ? "手工新增" : "单个编辑");
         storeDTO.setOperatorId(UserDetailUtils.getUserDetail().getUserId());
         storeDTO.setOperatorName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
-        ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
+        ServiceResponse<StoreDTO> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         if (serviceResponse.isSuccess()) {
             LogUtils.createLog((storeQO.getStoreId() == null ? "新增" : "编辑") + "门店", storeQO.getStoreName());
             return RestResponse.success(serviceResponse.getResult());