加入会员合并同账号数据
This commit is contained in:
parent
a5e3570cde
commit
51e1644624
|
|
@ -274,8 +274,10 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
|
||||||
oriInfo.setAlipayOpenId(userInfo.getWechatOpenId());
|
oriInfo.setAlipayOpenId(userInfo.getWechatOpenId());
|
||||||
}
|
}
|
||||||
// 迁移订单
|
// 迁移订单
|
||||||
orderInfoService.updateChain().eq(OrderInfo::getUserId, userInfo.getId())
|
|
||||||
.set(OrderInfo::getUserId, oriInfo.getId()).update();
|
OrderInfo orderInfo = new OrderInfo();
|
||||||
|
orderInfo.setUserId(oriInfo.getId());
|
||||||
|
orderInfoService.update(orderInfo, new QueryWrapper().eq(OrderInfo::getUserId, userInfo.getId()));
|
||||||
|
|
||||||
// 删除多余用户信息
|
// 删除多余用户信息
|
||||||
userInfoService.removeById(userId);
|
userInfoService.removeById(userId);
|
||||||
|
|
@ -285,11 +287,11 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
|
||||||
}
|
}
|
||||||
userInfoService.updateById(userInfo);
|
userInfoService.updateById(userInfo);
|
||||||
|
|
||||||
ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId));
|
ShopUser shopUser = getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userInfo.getId()));
|
||||||
if (shopUser == null) {
|
if (shopUser == null) {
|
||||||
shopUser = new ShopUser();
|
shopUser = new ShopUser();
|
||||||
shopUser.setShopId(shopId);
|
shopUser.setShopId(shopId);
|
||||||
shopUser.setUserId(userId);
|
shopUser.setUserId(userInfo.getId());
|
||||||
save(shopUser);
|
save(shopUser);
|
||||||
} else if (shopUser.getIsVip() == 1) {
|
} else if (shopUser.getIsVip() == 1) {
|
||||||
throw new ApiNotPrintException("您已加入店铺会员");
|
throw new ApiNotPrintException("您已加入店铺会员");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue