切换店铺 无权限问题
角色模板 关闭却新增问题 会员加入 时间
This commit is contained in:
@@ -208,7 +208,8 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||||||
Long headId = StpKit.USER.getHeadId();
|
Long headId = StpKit.USER.getHeadId();
|
||||||
long shopId = StpKit.USER.getLoginIdAsLong();
|
long shopId = StpKit.USER.getLoginIdAsLong();
|
||||||
ShopInfo currentInfo = shopInfoService.getById(shopId);
|
ShopInfo currentInfo = shopInfoService.getById(shopId);
|
||||||
if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) {
|
// if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) {
|
||||||
|
if (currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) {
|
||||||
throw new CzgException("登录账号无权限切换");
|
throw new CzgException("登录账号无权限切换");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,7 +218,7 @@ public class AuthorizationServiceImpl implements AuthorizationService {
|
|||||||
throw new CzgException("用户不存在");
|
throw new CzgException("用户不存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
ShopInfo shopInfo = shopInfoService.getById(sysUser.getId());
|
ShopInfo shopInfo = shopInfoService.getById(sysUserId);
|
||||||
if (shopInfo == null) {
|
if (shopInfo == null) {
|
||||||
throw new CzgException("店铺信息不存在");
|
throw new CzgException("店铺信息不存在");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -251,7 +251,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto) {
|
public Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto) {
|
||||||
roleTemplateService.list(new QueryWrapper().eq(SysRoleTemplate::getPid, dto.getId())).forEach(item -> {
|
roleTemplateService.list(new QueryWrapper().eq(SysRoleTemplate::getPid, dto.getId()).eq(SysRoleTemplate::getIsEnable, 1)).forEach(item -> {
|
||||||
SysRole role = getById(item.getRoleId());
|
SysRole role = getById(item.getRoleId());
|
||||||
role.setShopId(shopId);
|
role.setShopId(shopId);
|
||||||
role.setCreateUserId(shopId);
|
role.setCreateUserId(shopId);
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@@ -518,6 +519,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
|
|||||||
shopUser.setMemberCircleReward(memberOrder.getReward());
|
shopUser.setMemberCircleReward(memberOrder.getReward());
|
||||||
shopUser.setIsVip(1);
|
shopUser.setIsVip(1);
|
||||||
shopUser.setOpenType("PAY");
|
shopUser.setOpenType("PAY");
|
||||||
|
shopUser.setJoinTime(LocalDateTime.now());
|
||||||
if (memberOrder.getReward() != null) {
|
if (memberOrder.getReward() != null) {
|
||||||
//购买开通
|
//购买开通
|
||||||
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
|
deliver(shopUser, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
|
||||||
|
|||||||
Reference in New Issue
Block a user