|
|
@@ -86,7 +86,7 @@ public class DiningUserServiceImpl implements DiningUserService {
|
|
|
String token = generateAndStoreToken(openid, user);
|
|
|
|
|
|
// 5. 构建返回对象
|
|
|
- return buildDiningUserVo(user, token);
|
|
|
+ return buildDiningUserVo(user, token, openid);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -287,7 +287,7 @@ public class DiningUserServiceImpl implements DiningUserService {
|
|
|
/**
|
|
|
* 构建返回对象
|
|
|
*/
|
|
|
- private DiningUserVo buildDiningUserVo(LifeUser user, String token) {
|
|
|
+ private DiningUserVo buildDiningUserVo(LifeUser user, String token, String openid) {
|
|
|
DiningUserVo diningUserVo = new DiningUserVo();
|
|
|
diningUserVo.setId(user.getId().longValue());
|
|
|
diningUserVo.setPhone(user.getUserPhone());
|
|
|
@@ -296,6 +296,7 @@ public class DiningUserServiceImpl implements DiningUserService {
|
|
|
diningUserVo.setStatus(0);
|
|
|
diningUserVo.setCreatedTime(user.getCreatedTime());
|
|
|
diningUserVo.setToken(token);
|
|
|
+ diningUserVo.setOpenId(openid);
|
|
|
return diningUserVo;
|
|
|
}
|
|
|
|