修改httpClient回调取不到code值问题已经客户初始化没有跟管理员问题

epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@@ -71,6 +71,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_SAVEUSER, JSON.toJSONString(dto)).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            result.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!result.success()) {
             throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION);
         }
@@ -165,6 +168,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            result.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!result.success()) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), result.getCode(), result.getMsg()));
             throw new RenException(result.getCode());
@@ -211,6 +217,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            result.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!result.success()) {
             logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getPhone(), result.getCode(), result.getMsg()));
             throw new RenException(result.getCode());
@@ -259,6 +268,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         String data1 = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED, JSON.toJSONString(visited)).getData();
         JSONObject json = JSON.parseObject(data1);
         Result visitedResult = ConvertUtils.mapToEntity(json, Result.class);
+        if (null != json.get("code")) {
+            visitedResult.setCode(((Integer) json.get("code")).intValue());
+        }
         if (!visitedResult.success()) {
             logger.error(PublicUserLoginConstant.SAVE_VISITED_EXCEPTION);
         }
@@ -281,6 +293,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            result.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!result.success()) {
             logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
             throw new RenException(result.getCode());

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -510,6 +510,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            mapToResult.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!mapToResult.success()) {
             logger.error(String.format("根据appId查询客户Id失败，对应appId->" + appId));
             throw new RenException(mapToResult.getMsg());
@@ -532,6 +535,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         logger.info("ThirdLoginServiceImpl.getUserWeChat：httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+"，结果->"+data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            mapToResult.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!mapToResult.success()) {
             logger.error("居民端小程序登陆，调用epmet_third服务获取数据失败");
             throw new RenException(mapToResult.getCode());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -334,7 +334,7 @@ public class AgencyServiceImpl implements AgencyService {
         //3.查询客户具有指定RoleKey的角色信息
         CustomerRoleFormDTO customerRoleForm = new CustomerRoleFormDTO();
         customerRoleForm.setCustomerId(agencyDTO.getCustomerId());
-        customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);
+        customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
         Result<GovStaffRoleDTO> getRoleResult = epmetUserOpenFeignClient.getRoleOfCustomer(customerRoleForm);
         if (!getRoleResult.success() || getRoleResult.getData() == null) {
             log.error("查询客户具有指定RoleKey的角色信息失败:".concat(getRoleResult.toString()));

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -424,6 +424,9 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         String data = HttpClientManager.getInstance().sendPostByJSON(url, null).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result thirdResult = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            thirdResult.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!thirdResult.success()) {
             throw new RenException(thirdResult.getCode(), thirdResult.getInternalMsg());
         }

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@@ -313,6 +313,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
         logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:" + GuideHttpUrlConstant.CUSTOMER_MSG_URL + "，结果->" + data);
         JSONObject toResult = JSON.parseObject(data);
         Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
+        if (null != toResult.get("code")) {
+            mapToResult.setCode(((Integer) toResult.get("code")).intValue());
+        }
         if (!mapToResult.success()) {
             logger.error(String.format("根据appId查询客户Id失败，对应appId->" + appId));
             throw new RenException(mapToResult.getMsg());

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@@ -115,6 +115,9 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 		logger.info("调用third服务，根据appId查询客户信息：httpclient->url:" + customerMsgUrl + "，结果->" + data);
 		JSONObject toResult = JSON.parseObject(data);
 		Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
+		if (null != toResult.get("code")) {
+			mapToResult.setCode(((Integer) toResult.get("code")).intValue());
+		}
 		if (!mapToResult.success()) {
 			logger.error(String.format("根据appId查询客户信息失败，对应appId->" + formDTO.getAppId()));
 			throw new RenException(mapToResult.getMsg());