suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20240613_zxjp_init' into 'master'

Browse Source 
Cc 20240613 zxjp init

See merge request hangzhou/java/custom_zxjp!6
This commit is contained in:
杨杰
2024-06-28 02:06:25 +00:00
parent 7b4a925b5c 2adcc0d6f9
commit 3636a2189f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-common/src/main/java/com/cool/store/utils/GeoMapUtil.java
View File

@@ -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");

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -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());
}
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -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;
}