Merge branch 'ww' into test
This commit is contained in:
@@ -271,13 +271,18 @@ public class UserService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Result openMember(OpenMemberVo memberVo) {
|
public Result openMember(OpenMemberVo memberVo) {
|
||||||
// TbUserInfo userInfo = new TbUserInfo();
|
TbUserInfo userInfo = new TbUserInfo();
|
||||||
// userInfo.setId(memberVo.getId());
|
userInfo.setId(memberVo.getId());
|
||||||
// userInfo.setHeadImg(memberVo.getHeadImg());
|
userInfo.setHeadImg(memberVo.getHeadImg());
|
||||||
// userInfo.setNickName(memberVo.getNickName());
|
userInfo.setNickName(memberVo.getNickName());
|
||||||
// userInfo.setTelephone(memberVo.getTelephone());
|
userInfo.setTelephone(memberVo.getTelephone());
|
||||||
// userInfo.setBirthDay(memberVo.getBirthDay());
|
userInfo.setBirthDay(memberVo.getBirthDay());
|
||||||
// userInfoMapper.updateByPrimaryKeySelective(userInfo);
|
userInfoMapper.updateByPrimaryKeySelective(userInfo);
|
||||||
|
List<TbShopUser> tbShopUsers = shopUserMapper.selectAllByUserId(memberVo.getId().toString());
|
||||||
|
for (TbShopUser tbShopUser : tbShopUsers) {
|
||||||
|
tbShopUser.setTelephone(memberVo.getTelephone());
|
||||||
|
shopUserMapper.updateByPrimaryKey(tbShopUser);
|
||||||
|
}
|
||||||
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
|
TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
|
||||||
tbShopUser.setName(memberVo.getNickName());
|
tbShopUser.setName(memberVo.getNickName());
|
||||||
tbShopUser.setHeadImg(memberVo.getHeadImg());
|
tbShopUser.setHeadImg(memberVo.getHeadImg());
|
||||||
|
|||||||
Reference in New Issue
Block a user