From ab0ff8746333b635596e025877b592d60ed37f7d Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 14 Sep 2023 19:30:44 +0800 Subject: [PATCH] fix --- .../java/com/cool/store/http/ISVHttpRequest.java | 14 ++++++++------ .../service/impl/HyPartnerLineInfoServiceImpl.java | 3 ++- .../com/cool/store/controller/LoginController.java | 3 +-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java index 052dcc2d2..0654eb228 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java @@ -44,14 +44,16 @@ public class ISVHttpRequest { @Resource private HttpRestTemplateService httpRestTemplateService; - public UserIdInfoDTO getUserIdByCode(String paramStr){ - String url = isvDomain + "/user/getUserIdByCode?" + paramStr; - ResponseEntity responseEntity = null; + public UserIdInfoDTO getUserIdByCode(String code){ + String url = isvDomain + "/user/getUserIdByCode"; + ResultDTO responseEntity = null; + HashMap requestMap = new HashMap(); + requestMap.put("code", code); try { - responseEntity = RestTemplateUtil.loadGet(url, ResultDTO.class); + responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap); log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if(Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()){ - return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getBody().getData()), UserIdInfoDTO.class); + if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){ + return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), UserIdInfoDTO.class); } } catch (Exception e) { log.info("调用isv出错{}", e); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 1e734ab6c..751021637 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -927,12 +927,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoDAO.getByPartnerLineId(partnerLineId); PartnerSimpleBaseInfoVO result = PartnerSimpleBaseInfoVO.convertVO(partnerLineId, partnerUserInfo); String userPortrait = Optional.ofNullable(partnerBaseInfo).map(o->o.getUserPortrait()).orElse(null); + Long partnerBaseInfoId = Optional.ofNullable(partnerBaseInfo).map(o->o.getId()).orElse(null); + result.setPartnerBaseInfoId(partnerBaseInfoId); if (StringUtils.isNotEmpty(userPortrait) && Objects.nonNull(result)){ Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(userPortrait)); List userPortraitList = userPortraitMap.entrySet().stream() .map(entry -> new UserPortraitDTO(entry.getKey(), entry.getValue())) .collect(Collectors.toList()); - result.setPartnerBaseInfoId(partnerBaseInfo.getId()); result.setUserPortrait(userPortraitList); } return result; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java index a7b0d5e59..8ff7ff384 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java @@ -40,8 +40,7 @@ public class LoginController { log.info("feiShuLogin data={}", JSONObject.toJSONString(param)); String code = param.getCode(); try { - String value = "code=" + code; - UserIdInfoDTO userInfo = isvHttpRequest.getUserIdByCode(value); + UserIdInfoDTO userInfo = isvHttpRequest.getUserIdByCode(code); if(Objects.isNull(userInfo)){ throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR); }