diff --git a/cweb/src/main/java/com/cweb/controller/CommonController.java b/cweb/src/main/java/com/cweb/controller/CommonController.java index 3fc12e7..6823139 100644 --- a/cweb/src/main/java/com/cweb/controller/CommonController.java +++ b/cweb/src/main/java/com/cweb/controller/CommonController.java @@ -8,6 +8,7 @@ import com.hfkj.channel.saas.utils.SaasCommon; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.CoordCommonUtil; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsCompany; import com.hfkj.entity.SecRegion; @@ -279,24 +280,7 @@ public class CommonController { ) { try { - List list = storeService.getStoreList(name , childId); - - for (OpenStoreModel storeModel : list ) { - Map map = new HashMap<>(); - String regEx = "[\n`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。, ·、?]"; - map.put("address" , storeModel.getBlisRegAddress().replaceAll(regEx,"")); - map.put("location" , "showLocation"); - JSONObject object = commonService.getMapDetail(map); - - if (object.getInteger("status") == 0) { - JSONObject jsonObject = object.getJSONObject("result").getJSONObject("location"); - storeModel.setLatitude(jsonObject.getString("lat")); - storeModel.setLongitude(jsonObject.getString("lng")); - } - - } - - return ResponseMsgUtil.success(list); + return ResponseMsgUtil.success(storeService.getStoreList(name , childId)); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/service/src/main/java/com/hfkj/dao/BsStoreMapperExt.java b/service/src/main/java/com/hfkj/dao/BsStoreMapperExt.java index 11768d8..64b49b4 100644 --- a/service/src/main/java/com/hfkj/dao/BsStoreMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsStoreMapperExt.java @@ -27,7 +27,9 @@ public interface BsStoreMapperExt { @Select("