Browse Source

Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

dev
zxc 5 years ago
parent
commit
1025879a6e
  1. 2
      epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

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

@ -240,6 +240,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String token = this.generateGovWxmpToken(userDTO.getId()); String token = this.generateGovWxmpToken(userDTO.getId());
//4-2.判断是否存在信息,给customerId赋值 //4-2.判断是否存在信息,给customerId赋值
Map<String,Object> map2 = (Map)jsonObject.get("paCustomerResult"); Map<String,Object> map2 = (Map)jsonObject.get("paCustomerResult");
logger.info("map2的值:"+map2);
PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class); PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class);
String customerId = ""; String customerId = "";
if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) { if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) {
@ -247,6 +248,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
} }
//4-3.token存入redis //4-3.token存入redis
Map<String,Object> map3 = (Map)jsonObject.get("PaUserWechatDTO"); Map<String,Object> map3 = (Map)jsonObject.get("PaUserWechatDTO");
logger.info("map3的值:"+map3);
PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class); PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class);
String openid = wechatDTO.getWxOpenId(); String openid = wechatDTO.getWxOpenId();
String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId()); String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId());

Loading…
Cancel
Save