Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -260,7 +260,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
|
|||||||
} else if (shopUser.getIsVip() == 1) {
|
} else if (shopUser.getIsVip() == 1) {
|
||||||
throw new ApiNotPrintException("您已加入店铺会员");
|
throw new ApiNotPrintException("您已加入店铺会员");
|
||||||
}
|
}
|
||||||
shopUser = BeanUtil.copyProperties(shopUserAddDTO, ShopUser.class);
|
BeanUtil.copyProperties(shopUserAddDTO, shopUser);
|
||||||
shopUser.setIsVip(1);
|
shopUser.setIsVip(1);
|
||||||
shopUser.setCode(generateCode(shopId));
|
shopUser.setCode(generateCode(shopId));
|
||||||
shopUser.setJoinTime(DateUtil.date().toLocalDateTime());
|
shopUser.setJoinTime(DateUtil.date().toLocalDateTime());
|
||||||
|
|||||||
Reference in New Issue
Block a user