huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2025-02-20 19:20:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'puhui/feature/crm' into feature/crm

Browse Source 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
This commit is contained in:
YunaiV 2023-12-06 19:33:04 +08:00
commit d430063eec
16 changed files with 458 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
View File

@ -69,7 +69,10 @@ public interface ErrorCodeConstants {
// ========== 商机状态 1_020_011_000 ==========
ErrorCode BUSINESS_STATUS_NOT_EXISTS = new ErrorCode(1_020_011_000, "商机状态不存在");
// ========== 客户公海规则设置 1_020_011_000 ==========
// ========== 客户公海规则设置 1_020_012_000 ==========
ErrorCode CUSTOMER_LIMIT_CONFIG_NOT_EXISTS = new ErrorCode(1_020_012_000, "客户限制配置不存在");
// ========== 关注的数据 1_020_013_000 ==========
ErrorCode CRM_CONCERNED_NOT_EXISTS = new ErrorCode(1_020_013_000, "关注数据不存在");
}

7
yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/common/CrmSceneEnum.java
View File

@ -17,7 +17,8 @@ import java.util.Arrays;
public enum CrmSceneEnum implements IntArrayValuable {
OWNER(1, "我负责的"),
FOLLOW(2, "我关注的");
FOLLOW(2, "我关注的"),
SUBORDINATE(3, "下属负责的");
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmSceneEnum::getType).toArray();
@ -38,6 +39,10 @@ public enum CrmSceneEnum implements IntArrayValuable {
return ObjUtil.equal(FOLLOW.getType(), type);
}
public static boolean isSubordinate(Integer type) {
return ObjUtil.equal(SUBORDINATE.getType(), type);
}
@Override
public int[] array() {
return ARRAYS;

21
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
View File

@ -36,7 +36,6 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static java.util.Collections.singletonList;
@Tag(name = "管理后台 - CRM 客户")
@RestController
@ -140,6 +139,24 @@ public class CrmCustomerController {
return success(true);
}
@PutMapping("/concern")
@Operation(summary = "关注客户")
@Parameter(name = "ids", description = "编号", required = true, example = "[1024]")
@PreAuthorize("@ss.hasPermission('crm:customer:update')")
public CommonResult<Boolean> concernCustomer(@RequestParam("ids") List<Long> ids) {
customerService.concernCustomer(ids, getLoginUserId());
return success(true);
}
@PutMapping("/cancel-concern")
@Operation(summary = "取消关注客户")
@Parameter(name = "ids", description = "编号", required = true, example = "[1024]")
@PreAuthorize("@ss.hasPermission('crm:customer:update')")
public CommonResult<Boolean> cancelConcernCustomer(@RequestParam("ids") List<Long> ids) {
customerService.cancelConcernCustomer(ids, getLoginUserId());
return success(true);
}
// ==================== 公海相关操作 ====================
@PutMapping("/put-pool")
@ -178,7 +195,7 @@ public class CrmCustomerController {
@GetMapping("/query-all-list")
@Operation(summary = "查询客户列表")
@PreAuthorize("@ss.hasPermission('crm:customer:all')")
public CommonResult<List<CrmCustomerQueryAllRespVO>> queryAll(){
public CommonResult<List<CrmCustomerQueryAllRespVO>> queryAll() {
List<CrmCustomerDO> crmCustomerDOList = customerService.getCustomerList();
List<CrmCustomerQueryAllRespVO> data = CrmCustomerConvert.INSTANCE.convertQueryAll(crmCustomerDOList);
return success(data);

19
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/CrmCustomerPageReqVO.java
View File

@ -1,19 +1,16 @@
package cn.iocoder.yudao.module.crm.controller.admin.customer.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneEnum;
import cn.iocoder.yudao.module.crm.framework.vo.CrmBasePageReqVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - CRM 客户分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class CrmCustomerPageReqVO extends PageParam {
public class CrmCustomerPageReqVO extends CrmBasePageReqVO {
@Schema(description = "客户名称", example = "赵六")
private String name;
@ -30,16 +27,4 @@ public class CrmCustomerPageReqVO extends PageParam {
@Schema(description = "客户来源", example = "1")
private Integer source;
/**
* 场景类型
*
* 关联 {@link CrmSceneEnum}
*/
@Schema(description = "场景类型", example = "1")
private Integer sceneType;
@Schema(description = "是否为公海数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
@NotNull(message = "是否为公海数据不能为空")
private Boolean pool;
}

51
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/concerned/CrmConcernedDO.java Normal file
View File

@ -0,0 +1,51 @@
package cn.iocoder.yudao.module.crm.dal.dataobject.concerned;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
/**
* CRM 关注的数据 DO
*
* @author HUIHUI
*/
@TableName("crm_concerned")
@KeySequence("crm_concerned_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class CrmConcernedDO extends BaseDO {
/**
* 编号，主键自增
*/
@TableId
private Long id;
/**
* 数据类型
*
* 枚举 {@link CrmBizTypeEnum}
*/
private Integer bizType;
/**
* 数据编号
*
* 关联 {@link CrmBizTypeEnum} 对应模块 DO 的 id 字段
*/
private Long bizId;
/**
* 用户编号
*
* 关联 AdminUser 的 id 字段
*/
private Long userId;
}

35
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/concerned/CrmConcernedMapper.java Normal file
View File

@ -0,0 +1,35 @@
package cn.iocoder.yudao.module.crm.dal.mysql.concerned;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.crm.dal.dataobject.concerned.CrmConcernedDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
import java.util.List;
/**
* CRM 关注的数据 Mapper
*
* @author HUIHUI
*/
@Mapper
public interface CrmConcernedMapper extends BaseMapperX<CrmConcernedDO> {
/**
* 查询用户关注的数据
*
* @param bizType 数据类型，关联 {@link CrmBizTypeEnum}
* @param bizIds 数据编号，关联 {@link CrmBizTypeEnum} 对应模块 DO#getId()
* @param userId 用户编号
* @return 关注的数据
*/
default List<CrmConcernedDO> selectList(Integer bizType, Collection<Long> bizIds, Long userId) {
return selectList(new LambdaQueryWrapperX<CrmConcernedDO>()
.eq(CrmConcernedDO::getBizType, bizType)
.in(CrmConcernedDO::getBizId, bizIds)
.eq(CrmConcernedDO::getUserId, userId));
}
}

60
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
View File

@ -3,18 +3,17 @@ package cn.iocoder.yudao.module.crm.dal.mysql.customer;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.CrmCustomerPageReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.util.CrmQueryPageUtils;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
import java.util.List;
/**
@ -31,28 +30,21 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {
.set(CrmCustomerDO::getOwnerUserId, ownerUserId));
}
default PageResult<CrmCustomerDO> selectPageWithAdmin(CrmCustomerPageReqVO pageReqVO, Long userId) {
// 情况一：管理员查看
LambdaQueryWrapperX<CrmCustomerDO> queryWrapperX = new LambdaQueryWrapperX<>();
appendQueryParams(queryWrapperX, pageReqVO, userId);
return selectPage(pageReqVO, queryWrapperX
.likeIfPresent(CrmCustomerDO::getName, pageReqVO.getName())
.eqIfPresent(CrmCustomerDO::getMobile, pageReqVO.getMobile())
.eqIfPresent(CrmCustomerDO::getIndustryId, pageReqVO.getIndustryId())
.eqIfPresent(CrmCustomerDO::getLevel, pageReqVO.getLevel())
.eqIfPresent(CrmCustomerDO::getSource, pageReqVO.getSource()));
}
default PageResult<CrmCustomerDO> selectPage(CrmCustomerPageReqVO pageReqVO, Long userId) {
// 情况二：获取当前用户能看的分页数据
/**
* 获取客户分页
*
* @param pageReqVO 请求
* @param userId 用户编号
* @param subordinateIds 下属用户编号
* @param isAdmin 是否为管理
* @return 客户分页数据
*/
default PageResult<CrmCustomerDO> selectPage(CrmCustomerPageReqVO pageReqVO, Long userId, Collection<Long> subordinateIds, Boolean isAdmin) {
IPage<CrmCustomerDO> mpPage = MyBatisUtils.buildPage(pageReqVO);
MPJLambdaWrapperX<CrmCustomerDO> mpjLambdaWrapperX = new MPJLambdaWrapperX<>();
// 构建数据权限连表条件
mpjLambdaWrapperX
.innerJoin(CrmPermissionDO.class, CrmPermissionDO::getBizId, CrmCustomerDO::getId)
.eq(CrmPermissionDO::getBizType, CrmBizTypeEnum.CRM_CUSTOMER.getType())
.eq(CrmPermissionDO::getUserId, userId);
appendQueryParams(mpjLambdaWrapperX, pageReqVO, userId);
CrmQueryPageUtils.builderQuery(mpjLambdaWrapperX, pageReqVO, userId,
CrmBizTypeEnum.CRM_CUSTOMER.getType(), CrmCustomerDO::getId, subordinateIds, isAdmin);
mpjLambdaWrapperX
.selectAll(CrmCustomerDO.class)
.likeIfPresent(CrmCustomerDO::getName, pageReqVO.getName())
@ -69,28 +61,4 @@ public interface CrmCustomerMapper extends BaseMapperX<CrmCustomerDO> {
return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
}
static void appendQueryParams(MPJLambdaWrapperX<CrmCustomerDO> mpjLambdaWrapperX, CrmCustomerPageReqVO pageReqVO, Long userId) {
if (pageReqVO.getPool()) { // 情况一：公海
mpjLambdaWrapperX.isNull(CrmCustomerDO::getOwnerUserId);
} else { // 情况二：不是公海
mpjLambdaWrapperX.isNotNull(CrmCustomerDO::getOwnerUserId);
}
// TODO 场景数据过滤
if (CrmSceneEnum.isOwner(pageReqVO.getSceneType())) { // 场景一：我负责的数据
mpjLambdaWrapperX.eq(CrmCustomerDO::getOwnerUserId, userId);
}
}
static void appendQueryParams(LambdaQueryWrapperX<CrmCustomerDO> lambdaQueryWrapperX, CrmCustomerPageReqVO pageReqVO, Long userId) {
if (pageReqVO.getPool()) { // 情况一：公海
lambdaQueryWrapperX.isNull(CrmCustomerDO::getOwnerUserId);
} else { // 情况二：不是公海
lambdaQueryWrapperX.isNotNull(CrmCustomerDO::getOwnerUserId);
}
// TODO 场景数据过滤
if (CrmSceneEnum.isOwner(pageReqVO.getSceneType())) { // 场景一：我负责的数据
lambdaQueryWrapperX.eq(CrmCustomerDO::getOwnerUserId, userId);
}
}
}

27
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/vo/CrmBasePageReqVO.java Normal file
View File

@ -0,0 +1,27 @@
package cn.iocoder.yudao.module.crm.framework.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Schema(description = "管理后台 - CRM 分页 Base Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
public class CrmBasePageReqVO extends PageParam {
/**
* 场景类型, 为 null 时则表示全部
*
* 关联 {@link CrmSceneEnum}
*/
@Schema(description = "场景类型", example = "1")
@InEnum(CrmSceneEnum.class)
private Integer sceneType;
@Schema(description = "是否为公海数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
private Boolean pool; // null 则表示为不是公海数据
}

40
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/concerned/CrmConcernedService.java Normal file
View File

@ -0,0 +1,40 @@
package cn.iocoder.yudao.module.crm.service.concerned;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.service.concerned.bo.CrmConcernedCreateReqBO;
import javax.validation.Valid;
import java.util.Collection;
/**
* CRM 关注的数据 Service 接口
*
* @author HUIHUI
*/
public interface CrmConcernedService {
/**
* 创建关注数据
*
* @param createReqBO 创建请求
* @return 编号
*/
Long createConcerned(@Valid CrmConcernedCreateReqBO createReqBO);
/**
* 批量创建关注数据
*
* @param createReqBO 创建请求
*/
void createConcernedBatch(@Valid Collection<CrmConcernedCreateReqBO> createReqBO);
/**
* 删除关注数据
*
* @param bizType 数据类型，关联 {@link CrmBizTypeEnum}
* @param bizIds 数据编号，关联 {@link CrmBizTypeEnum} 对应模块 DO#getId()
* @param userId 用户编号
*/
void deleteConcerned(Integer bizType, Collection<Long> bizIds, Long userId);
}

71
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/concerned/CrmConcernedServiceImpl.java Normal file
View File

@ -0,0 +1,71 @@
package cn.iocoder.yudao.module.crm.service.concerned;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.crm.dal.dataobject.concerned.CrmConcernedDO;
import cn.iocoder.yudao.module.crm.dal.mysql.concerned.CrmConcernedMapper;
import cn.iocoder.yudao.module.crm.service.concerned.bo.CrmConcernedCreateReqBO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CRM_CONCERNED_NOT_EXISTS;
/**
* CRM 关注的数据 Service 接口实现类
*
* @author HUIHUI
*/
@Service
@Validated
public class CrmConcernedServiceImpl implements CrmConcernedService {
@Resource
private CrmConcernedMapper concernedMapper;
@Resource
private AdminUserApi adminUserApi;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createConcerned(CrmConcernedCreateReqBO createReqBO) {
// 1. 校验用户是否存在
adminUserApi.validateUserList(Collections.singletonList(createReqBO.getUserId()));
// 2. 创建
CrmConcernedDO concerned = BeanUtils.toBean(createReqBO, CrmConcernedDO.class);
concernedMapper.insert(concerned);
return concerned.getId();
}
@Override
public void createConcernedBatch(Collection<CrmConcernedCreateReqBO> createReqBO) {
// 1. 校验用户是否存在
adminUserApi.validateUserList(convertSet(createReqBO, CrmConcernedCreateReqBO::getUserId));
// 2. 创建
List<CrmConcernedDO> concernedList = convertList(createReqBO, item -> BeanUtils.toBean(item, CrmConcernedDO.class));
concernedMapper.insertBatch(concernedList);
}
@Override
public void deleteConcerned(Integer bizType, Collection<Long> bizIds, Long userId) {
// 1. 查询关注数据
List<CrmConcernedDO> concernedList = concernedMapper.selectList(bizType, bizIds, userId);
if (ObjUtil.notEqual(bizIds.size(), concernedList.size())) {
throw exception(CRM_CONCERNED_NOT_EXISTS);
}
// 2. 删除
concernedMapper.deleteBatchIds(convertList(concernedList, CrmConcernedDO::getId));
}
}

35
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/concerned/bo/CrmConcernedCreateReqBO.java Normal file
View File

@ -0,0 +1,35 @@
package cn.iocoder.yudao.module.crm.service.concerned.bo;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* CRM 关注的数据 Create Req BO
*
* @author HUIHUI
*/
@Data
public class CrmConcernedCreateReqBO {
/**
* 当前登录用户编号
*/
@NotNull(message = "用户编号不能为空")
private Long userId;
/**
* Crm 类型
*/
@NotNull(message = "Crm 类型不能为空")
@InEnum(CrmBizTypeEnum.class)
private Integer bizType;
/**
* 数据编号
*/
@NotNull(message = "Crm 数据编号不能为空")
private Long bizId;
}

18
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java
View File

@ -90,6 +90,22 @@ public interface CrmCustomerService {
*/
void lockCustomer(@Valid CrmCustomerUpdateReqVO updateReqVO);
/**
* 关注客户
*
* @param ids 客户编号
* @param userId 用户编号
*/
void concernCustomer(List<Long> ids, Long userId);
/**
* 取消关注客户
*
* @param ids 客户编号
* @param userId 用户编号
*/
void cancelConcernCustomer(List<Long> ids, Long userId);
// ==================== 公海相关操作 ====================
/**
@ -109,8 +125,10 @@ public interface CrmCustomerService {
/**
* 获取客户列表
*
* @return 客户列表
* @author zyna
*/
List<CrmCustomerDO> getCustomerList();
}

45
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
View File

@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.crm.service.customer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.CrmCustomerCreateReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.CrmCustomerPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.CrmCustomerTransferReqVO;
@ -9,9 +11,11 @@ import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.CrmCustomerUpdat
import cn.iocoder.yudao.module.crm.convert.customer.CrmCustomerConvert;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.mysql.customer.CrmCustomerMapper;
import cn.iocoder.yudao.module.crm.framework.core.annotations.CrmPermission;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
import cn.iocoder.yudao.module.crm.framework.core.annotations.CrmPermission;
import cn.iocoder.yudao.module.crm.service.concerned.CrmConcernedService;
import cn.iocoder.yudao.module.crm.service.concerned.bo.CrmConcernedCreateReqBO;
import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -23,6 +27,7 @@ import javax.annotation.Resource;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
import static java.util.Collections.singletonList;
@ -41,6 +46,9 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
@Resource
private CrmPermissionService crmPermissionService;
@Resource
private CrmConcernedService crmConcernedService;
@Resource
private AdminUserApi adminUserApi;
@ -102,12 +110,8 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
@Override
public PageResult<CrmCustomerDO> getCustomerPage(CrmCustomerPageReqVO pageReqVO, Long userId) {
boolean admin = false;
if (admin) { // 1.1. 情况一： TODO 如果是管理员; TODO @puhui999：要不如果是超管，就复用 selectPage；
customerMapper.selectPageWithAdmin(pageReqVO, userId);
}
// 1.2. 情况二：获取当前用户能看的分页数据
return customerMapper.selectPage(pageReqVO, userId);
boolean admin = false; // TODO 如果是管理员
return customerMapper.selectPage(pageReqVO, userId, adminUserApi.getSubordinateIds(userId), admin);
}
/**
@ -151,6 +155,33 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
customerMapper.updateById(updateObj);
}
@Override
public void concernCustomer(List<Long> ids, Long userId) {
// 1. 校验客户是否存在
validateCustomerExists(ids);
// 2. 创建关注
List<CrmConcernedCreateReqBO> createReqBOs = BeanUtils.toBean(convertList(ids, id -> new CrmConcernedCreateReqBO()
.setBizType(CrmBizTypeEnum.CRM_CUSTOMER.getType()).setBizId(id).setUserId(userId)), CrmConcernedCreateReqBO.class);
crmConcernedService.createConcernedBatch(createReqBOs);
}
@Override
public void cancelConcernCustomer(List<Long> ids, Long userId) {
// 1. 校验客户是否存在
validateCustomerExists(ids);
// 2. 取消关注
crmConcernedService.deleteConcerned(CrmBizTypeEnum.CRM_CUSTOMER.getType(), ids, userId);
}
private void validateCustomerExists(List<Long> ids) {
List<CrmCustomerDO> customerList = customerMapper.selectBatchIds(ids);
if (ObjUtil.notEqual(ids.size(), customerList.size())) {
throw exception(CUSTOMER_NOT_EXISTS);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
@CrmPermission(bizType = CrmBizTypeEnum.CRM_CUSTOMER, bizId = "#id", level = CrmPermissionLevelEnum.OWNER)

63
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmQueryPageUtils.java Normal file
View File

@ -0,0 +1,63 @@
package cn.iocoder.yudao.module.crm.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.module.crm.dal.dataobject.concerned.CrmConcernedDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmSceneEnum;
import cn.iocoder.yudao.module.crm.framework.vo.CrmBasePageReqVO;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import javax.annotation.Nullable;
import java.util.Collection;
/**
* CRM 分页查询工具类
*
* @author HUIHUI
*/
public class CrmQueryPageUtils {
/**
* 构造 crm 数据类型数据分页查询条件
*
* @param queryMapper 连表查询对象
* @param reqVO 查询条件
* @param userId 用户编号
* @param bizType 数据类型 {@link CrmBizTypeEnum}
* @param bizId 数据编号
* @param subordinateIds 下属用户编号，可为空
*/
public static <T extends MPJLambdaWrapper<?>, V extends CrmBasePageReqVO, S> void builderQuery(T queryMapper, V reqVO, Long userId,
Integer bizType, SFunction<S, ?> bizId,
@Nullable Collection<Long> subordinateIds,
Boolean isAdmin) {
// 构建数据权限连表条件
if (ObjUtil.notEqual(isAdmin, Boolean.TRUE)) { // 管理员不需要数据权限
queryMapper.innerJoin(CrmPermissionDO.class, on ->
on.eq(CrmPermissionDO::getBizType, bizType).eq(CrmPermissionDO::getBizId, bizId)
.eq(CrmPermissionDO::getUserId, userId));
}
if (ObjUtil.equal(reqVO.getPool(), Boolean.TRUE)) { // 情况一：公海
queryMapper.isNull("owner_user_id");
} else { // 情况二：不是公海
queryMapper.isNotNull("owner_user_id");
}
// 场景数据过滤
if (CrmSceneEnum.isOwner(reqVO.getSceneType())) { // 场景一：我负责的数据
queryMapper.eq("owner_user_id", userId);
}
if (CrmSceneEnum.isFollow(reqVO.getSceneType())) { // 场景二：我关注的数据
queryMapper.innerJoin(CrmConcernedDO.class, on ->
on.eq(CrmConcernedDO::getBizType, bizType).eq(CrmConcernedDO::getBizId, bizId)
.eq(CrmConcernedDO::getUserId, userId));
}
// TODO puhui999: 这里有一个疑问：如果下属负责的数据权限中没有自己的话还能看吗？
if (CrmSceneEnum.isSubordinate(reqVO.getSceneType()) && CollUtil.isNotEmpty(subordinateIds)) { // 场景三：下属负责的数据
queryMapper.in("owner_user_id", subordinateIds);
}
}
}

9
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Admin 用户 API 接口
@ -22,6 +23,14 @@ public interface AdminUserApi {
*/
AdminUserRespDTO getUser(Long id);
/**
* 通过用户 ID 查询用户下属
*
* @param id 用户编号
* @return 用户下属用户编号列表
*/
Set<Long> getSubordinateIds(Long id);
/**
* 通过用户 ID 查询用户们
*

26
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
View File

@ -1,14 +1,22 @@
package cn.iocoder.yudao.module.system.api.user;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import cn.iocoder.yudao.module.system.convert.user.UserConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
/**
* Admin 用户 API 实现类
@ -20,6 +28,8 @@ public class AdminUserApiImpl implements AdminUserApi {
@Resource
private AdminUserService userService;
@Resource
private DeptService deptService;
@Override
public AdminUserRespDTO getUser(Long id) {
@ -27,6 +37,22 @@ public class AdminUserApiImpl implements AdminUserApi {
return BeanUtils.toBean(user, AdminUserRespDTO.class);
}
@Override
public Set<Long> getSubordinateIds(Long id) {
AdminUserDO user = userService.getUser(id);
if (user == null) {
return null;
}
Set<Long> subordinateIds = null; // 下属用户编号
DeptDO dept = deptService.getDept(user.getDeptId());
if (ObjUtil.equal(dept.getLeaderUserId(), id)) { // 校验是否是该部门的负责人
List<AdminUserDO> users = userService.getUserListByDeptIds(Collections.singletonList(dept.getId()));
subordinateIds = convertSet(users, AdminUserDO::getId);
}
return subordinateIds;
}
@Override
public List<AdminUserRespDTO> getUserList(Collection<Long> ids) {
List<AdminUserDO> users = userService.getUserList(ids);