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

Merge remote-tracking branch 'hsayi/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

Browse Source
This commit is contained in:
苏竹红
2023-09-14 19:37:54 +08:00
parent e1fc5487e4 1be2b624d2
commit 60477375fd
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java
View File

@@ -44,14 +44,16 @@ public class ISVHttpRequest {
@Resource @Resource
private HttpRestTemplateService httpRestTemplateService; private HttpRestTemplateService httpRestTemplateService;
public UserIdInfoDTO getUserIdByCode(String paramStr){ public UserIdInfoDTO getUserIdByCode(String code){
String url = isvDomain + "/user/getUserIdByCode?" + paramStr; String url = isvDomain + "/user/getUserIdByCode";
ResponseEntity<ResultDTO> responseEntity = null; ResultDTO responseEntity = null;
HashMap requestMap = new HashMap();
requestMap.put("code", code);
try { try {
responseEntity = RestTemplateUtil.loadGet(url, ResultDTO.class); responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap);
log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity));
if(Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()){ if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){
return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getBody().getData()), UserIdInfoDTO.class); return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), UserIdInfoDTO.class);
} }
} catch (Exception e) { } catch (Exception e) {
log.info("调用isv出错{}", e); log.info("调用isv出错{}", e);

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -928,12 +928,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoDAO.getByPartnerLineId(partnerLineId); HyPartnerBaseInfoDO partnerBaseInfo = hyPartnerBaseInfoDAO.getByPartnerLineId(partnerLineId);
PartnerSimpleBaseInfoVO result = PartnerSimpleBaseInfoVO.convertVO(partnerLineId, partnerUserInfo); PartnerSimpleBaseInfoVO result = PartnerSimpleBaseInfoVO.convertVO(partnerLineId, partnerUserInfo);
String userPortrait = Optional.ofNullable(partnerBaseInfo).map(o->o.getUserPortrait()).orElse(null); 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)){ if (StringUtils.isNotEmpty(userPortrait) && Objects.nonNull(result)){
Map<Long, String> userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(userPortrait)); Map<Long, String> userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(userPortrait));
List<UserPortraitDTO> userPortraitList = userPortraitMap.entrySet().stream() List<UserPortraitDTO> userPortraitList = userPortraitMap.entrySet().stream()
.map(entry -> new UserPortraitDTO(entry.getKey(), entry.getValue())) .map(entry -> new UserPortraitDTO(entry.getKey(), entry.getValue()))
.collect(Collectors.toList()); .collect(Collectors.toList());
result.setPartnerBaseInfoId(partnerBaseInfo.getId());
result.setUserPortrait(userPortraitList); result.setUserPortrait(userPortraitList);
} }
return result; return result;

3
coolstore-partner-webb/src/main/java/com/cool/store/controller/LoginController.java
View File

@@ -40,8 +40,7 @@ public class LoginController {
log.info("feiShuLogin data={}", JSONObject.toJSONString(param)); log.info("feiShuLogin data={}", JSONObject.toJSONString(param));
String code = param.getCode(); String code = param.getCode();
try { try {
String value = "code=" + code; UserIdInfoDTO userInfo = isvHttpRequest.getUserIdByCode(code);
UserIdInfoDTO userInfo = isvHttpRequest.getUserIdByCode(value);
if(Objects.isNull(userInfo)){ if(Objects.isNull(userInfo)){
throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR); throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR);
} }