diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java b/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java index cdac5fd..7146408 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java @@ -38,4 +38,9 @@ public class WeChatEquipment implements Serializable { private Long equipmentId; + @Schema(title = "用户ID") + private Long userId; + + + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java index 34dd561..2878408 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java @@ -83,7 +83,7 @@ public interface LoginEquipmentMapper extends ExtendMapper { default Long countFreeEquipment(Long currentUserId, Integer number) { return this.selectCount (WrappersX.lambdaQueryX(LoginEquipment.class).eq - (LoginEquipment::getUserId, currentUserId).eq(LoginEquipment::getPackageType, DefaultNumberConstants.TWO_NUMBER)); + (LoginEquipment::getUserId, currentUserId).eq(LoginEquipment::getPackageType, number)); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java index 0d11b1f..a2116d7 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java @@ -1,6 +1,7 @@ package com.baiye.modules.distribute.mapper; import com.baiye.extend.mybatis.plus.mapper.ExtendMapper; +import com.baiye.extend.mybatis.plus.toolkit.WrappersX; import com.baiye.modules.distribute.entity.WeChatEquipment; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,19 @@ import org.apache.ibatis.annotations.Mapper; public interface WeChatEquipmentMapper extends ExtendMapper { + /** + * 统计数据 + * + * @param accountId + * @param equipmentId + * @return + */ + default Long countEquipment(Long accountId, Long equipmentId) { + return this.selectCount + (WrappersX.lambdaQueryX(WeChatEquipment.class).eq + (WeChatEquipment::getAccountId, accountId).eq(WeChatEquipment::getEquipmentId, equipmentId)); + + } } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java index 4ba5ef6..a393389 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java @@ -86,8 +86,7 @@ public class AliPayServiceImpl extends ExtendServiceImpl DefaultNumberConstants.THREE_NUMBER) { - throw new BadRequestException("至多创建三台免费设备!"); - } Long countFreeEquipment = loginEquipmentService.countFreeEquipment(userId, DefaultNumberConstants.ONE_NUMBER); if (ObjectUtil.isNotNull(countFreeEquipment) - && countFreeEquipment + num >= DefaultNumberConstants.THREE_NUMBER) { + && countFreeEquipment + num > DefaultNumberConstants.THREE_NUMBER) { throw new BadRequestException("至多创建三台免费设备!"); } // 创建设备 diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java index ed04d1e..4b73167 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; -import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.WeChatRequestConstants; import com.baiye.domain.PageParam; import com.baiye.domain.PageResult; diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java index d2ae443..d41693b 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java @@ -125,10 +125,10 @@ public class WeChatServiceImpl extends ExtendServiceImpl beanToMap = BeanUtil.beanToMap(pushCodeDTO); String pushQrCodeResult = HttpUtil.get @@ -184,12 +183,22 @@ public class WeChatServiceImpl extends ExtendServiceImpl diff --git a/marketing-platform-common/common-core/src/main/java/com/baiye/enums/PackageEnum.java b/marketing-platform-common/common-core/src/main/java/com/baiye/enums/PackageEnum.java index dc59632..acc004a 100644 --- a/marketing-platform-common/common-core/src/main/java/com/baiye/enums/PackageEnum.java +++ b/marketing-platform-common/common-core/src/main/java/com/baiye/enums/PackageEnum.java @@ -16,7 +16,7 @@ public enum PackageEnum { /** * 月度 */ - MONTH(1, 30), + MONTH(1, 3), /** * 季度 diff --git a/marketing-platform-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java b/marketing-platform-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java index bba3360..254358b 100644 --- a/marketing-platform-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java +++ b/marketing-platform-system/system-biz/src/main/java/com/baiye/system/service/impl/SysRoleServiceImpl.java @@ -1,124 +1,94 @@ package com.baiye.system.service.impl; -import cn.hutool.core.collection.ListUtil; -import com.baiye.security.constant.UserAttributeNameConstants; -import com.baiye.security.userdetails.User; -import com.baiye.security.util.SecurityUtils; -import com.baiye.system.checker.AdminUserChecker; -import com.baiye.system.enums.RoleCodeEnum; +import com.baiye.domain.PageParam; +import com.baiye.domain.PageResult; +import com.baiye.domain.SelectData; +import com.baiye.exception.BusinessException; +import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.result.BaseResultCode; +import com.baiye.system.mapper.SysRoleMapper; import com.baiye.system.model.entity.SysRole; import com.baiye.system.model.qo.SysRoleQO; import com.baiye.system.model.vo.SysRolePageVO; import com.baiye.system.service.SysRoleMenuService; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.baiye.exception.BusinessException; -import com.baiye.result.BaseResultCode; -import com.baiye.system.mapper.SysRoleMapper; import com.baiye.system.service.SysRoleService; -import com.baiye.domain.PageParam; -import com.baiye.domain.PageResult; -import com.baiye.domain.SelectData; -import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; -import java.util.*; +import java.util.List; import java.util.stream.Collectors; @Service @RequiredArgsConstructor public class SysRoleServiceImpl extends ExtendServiceImpl implements SysRoleService { - private final SysRoleMenuService sysRoleMenuService; - - private final AdminUserChecker adminUserChecker; + private final SysRoleMenuService sysRoleMenuService; - /** - * 查询系统角色列表 - * - * @param pageParam 分页对象 - * @param qo 查询参数 - * @return 分页对象 - */ - @Override - public PageResult queryPage(PageParam pageParam, SysRoleQO qo) { - return baseMapper.queryPage(pageParam, qo); - } - /** - * 通过角色ID,删除角色,并清空角色菜单缓存 - * - * @param id 角色ID - * @return boolean - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean removeById(Serializable id) { - SysRole role = getById(id); - sysRoleMenuService.deleteByRoleCode(role.getCode()); - return SqlHelper.retBool(baseMapper.deleteById(id)); - } + /** + * 查询系统角色列表 + * + * @param pageParam 分页对象 + * @param qo 查询参数 + * @return 分页对象 + */ + @Override + public PageResult queryPage(PageParam pageParam, SysRoleQO qo) { + return baseMapper.queryPage(pageParam, qo); + } - /** - * 角色的选择数据 - * - * @return List> - */ - @Override - public List> listSelectData() { - List> selectData = baseMapper.listSelectData(); + /** + * 通过角色ID,删除角色,并清空角色菜单缓存 + * + * @param id 角色ID + * @return boolean + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean removeById(Serializable id) { + SysRole role = getById(id); + sysRoleMenuService.deleteByRoleCode(role.getCode()); + return SqlHelper.retBool(baseMapper.deleteById(id)); + } - User user = SecurityUtils.getUser(); - @SuppressWarnings("unchecked") - Collection roleCodeList = (Collection) user.getAttributes().get(UserAttributeNameConstants.ROLE_CODES); + /** + * 角色的选择数据 + * + * @return List> + */ + @Override + public List> listSelectData() { + List> selectData = baseMapper.listSelectData(); - String salesExecutive = RoleCodeEnum.find(14L); - String storeExecutive = RoleCodeEnum.find(22L); - String entryClerk = RoleCodeEnum.find(15L); - String directExecutive = RoleCodeEnum.find(24L); - Set list = new HashSet<>(); - if (adminUserChecker.isAdminUser(user.getUserId())) { - list.addAll(ListUtil.of(salesExecutive, storeExecutive, directExecutive)); - } - if (roleCodeList.contains(salesExecutive)) { - list.add(entryClerk); - } - if (roleCodeList.contains(storeExecutive)) { - List excludeRoleCode = ListUtil.of(RoleCodeEnum.find(1L), salesExecutive, storeExecutive, entryClerk); - List collect = selectData.stream().map(SelectData::getValue).filter(value -> !excludeRoleCode.contains(String.valueOf(value))).map(String::valueOf).collect(Collectors.toList()); - list.addAll(collect); - } - if (roleCodeList.contains(directExecutive)) { - list.addAll(ListUtil.of(RoleCodeEnum.find(25L), RoleCodeEnum.find(26L))); - } - return selectData.stream().filter(c -> list.contains(String.valueOf(c.getValue()))).collect(Collectors.toList()); - } + return selectData.stream().filter(c -> "2".equals(c.getType())).collect(Collectors.toList()); + } - /** - * 是否存在角色code - * - * @param roleCode 角色code - * @return boolean 是否存在 - */ - @Override - public boolean existsRoleCode(String roleCode) { - return baseMapper.existsRoleCode(roleCode); - } + /** + * 是否存在角色code + * + * @param roleCode 角色code + * @return boolean 是否存在 + */ + @Override + public boolean existsRoleCode(String roleCode) { + return baseMapper.existsRoleCode(roleCode); + } - /** - * 新增角色 - * - * @param sysRole 角色对象 - * @return boolean 是否新增成功 - */ - @Override - public boolean save(SysRole sysRole) { - if (existsRoleCode(sysRole.getCode())) { - throw new BusinessException(BaseResultCode.LOGIC_CHECK_ERROR, "角色标识已存在!"); - } - return SqlHelper.retBool(getBaseMapper().insert(sysRole)); - } + /** + * 新增角色 + * + * @param sysRole 角色对象 + * @return boolean 是否新增成功 + */ + @Override + public boolean save(SysRole sysRole) { + if (existsRoleCode(sysRole.getCode())) { + throw new BusinessException(BaseResultCode.LOGIC_CHECK_ERROR, "角色标识已存在!"); + } + return SqlHelper.retBool(getBaseMapper().insert(sysRole)); + } } diff --git a/marketing-platform-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml b/marketing-platform-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml index 472ad20..5e6d7c4 100644 --- a/marketing-platform-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/marketing-platform-system/system-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -4,7 +4,8 @@