加入会员合并同账号数据
This commit is contained in:
@@ -282,8 +282,10 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
|
|||||||
BeanUtil.copyProperties(oriInfo, userInfo, "id", "alipayOpenId", "wechatOpenId");
|
BeanUtil.copyProperties(oriInfo, userInfo, "id", "alipayOpenId", "wechatOpenId");
|
||||||
|
|
||||||
ShopUser oldUserInfo = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, oriInfo.getId()));
|
ShopUser oldUserInfo = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, oriInfo.getId()));
|
||||||
removeById(oldUserInfo.getId());
|
if (oldUserInfo != null) {
|
||||||
BeanUtil.copyProperties(oldUserInfo, shopUser, "id", "userId");
|
removeById(oldUserInfo.getId());
|
||||||
|
BeanUtil.copyProperties(oldUserInfo, shopUser, "id", "userId");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BeanUtil.copyProperties(shopUserAddDTO, shopUser);
|
BeanUtil.copyProperties(shopUserAddDTO, shopUser);
|
||||||
|
|||||||
Reference in New Issue
Block a user