diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java index 9670f9072..8732ec68a 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java @@ -1,5 +1,6 @@ package com.cool.store.utils; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.Data; @@ -63,7 +64,7 @@ public class GeoMapUtil { JSONObject addressComponent = geoJson.getJSONObject("addressComponent"); // 根据实际响应结构解析省市区街道信息,此处仅为示例 String province = (String) addressComponent.get("province"); - String city = (String) addressComponent.get("city"); + String city = addressComponent.get("city") instanceof String?(String) addressComponent.get("city"):province; String district = (String) addressComponent.get("district"); String township = (String) addressComponent.get("township"); String address = geoJson.getString("formatted_address"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index cfa0a9869..2995345b3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -195,12 +195,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); if (Objects.nonNull(userInfoByJobnumber)){ - submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + submitLicenseResponse.setApprover(userInfoByJobnumber.getName()); } }else { EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); if (Objects.nonNull(enterpriseUserDO)){ - submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); + submitLicenseResponse.setApprover(enterpriseUserDO.getName()); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index f500ffacf..719d55d2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -939,7 +939,7 @@ public class PointServiceImpl implements PointService { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager()); - result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); + result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()); return result; }