BJ_ZTEITS-Developers / parking-cloud-yudao

Commit ba1b02800187705b09d043a6dc772aafd19f5e90

Authored by puhui999
1 parent f56fab93

CRM：完善数据权限，实现数据权限同时添加、同时转移

Inline Side-by-side
Showing 21 changed files with 253 additions and 72 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
  View file @ba1b028
... ... @@ -3,15 +3,19 @@ package cn.iocoder.yudao.module.crm.controller.admin.business.vo.business;
3 3 import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import jakarta.validation.constraints.NotNull;
  6 +import lombok.AllArgsConstructor;
6 7 import lombok.Data;
  8 +import lombok.NoArgsConstructor;
7 9  
8 10 @Schema(description = "管理后台 - 商机转移 Request VO")
9 11 @Data
  12 +@NoArgsConstructor
  13 +@AllArgsConstructor
10 14 public class CrmBusinessTransferReqVO {
11 15  
12 16 @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
13 17 @NotNull(message = "商机编号不能为空")
14   - private Long id;
  18 + private Long bizId;
15 19  
16 20 /**
17 21 * 新负责人的用户编号
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueTransferReqVO.java
  View file @ba1b028
... ... @@ -12,7 +12,7 @@ public class CrmClueTransferReqVO {
12 12  
13 13 @Schema(description = "线索编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
14 14 @NotNull(message = "线索编号不能为空")
15   - private Long id;
  15 + private Long bizId;
16 16  
17 17 @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
18 18 @NotNull(message = "新负责人的用户编号不能为空")
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
  View file @ba1b028
... ... @@ -2,17 +2,21 @@ package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
2 2  
3 3 import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.AllArgsConstructor;
5 6 import lombok.Data;
6 7  
7 8 import jakarta.validation.constraints.NotNull;
  9 +import lombok.NoArgsConstructor;
8 10  
9 11 @Schema(description = "管理后台 - CRM 联系人转移 Request VO")
10 12 @Data
  13 +@NoArgsConstructor
  14 +@AllArgsConstructor
11 15 public class CrmContactTransferReqVO {
12 16  
13 17 @Schema(description = "联系人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
14 18 @NotNull(message = "联系人编号不能为空")
15   - private Long id;
  19 + private Long bizId;
16 20  
17 21 /**
18 22 * 新负责人的用户编号
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
  View file @ba1b028
... ... @@ -3,17 +3,21 @@ package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract;
3 3 import cn.iocoder.yudao.framework.common.validation.InEnum;
4 4 import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
5 5 import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.AllArgsConstructor;
6 7 import lombok.Data;
7 8  
8 9 import jakarta.validation.constraints.NotNull;
  10 +import lombok.NoArgsConstructor;
9 11  
10 12 @Schema(description = "管理后台 - CRM 合同转移 Request VO")
11 13 @Data
  14 +@NoArgsConstructor
  15 +@AllArgsConstructor
12 16 public class CrmContractTransferReqVO {
13 17  
14 18 @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
15 19 @NotNull(message = "联系人编号不能为空")
16   - private Long id;
  20 + private Long bizId;
17 21  
18 22 @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
19 23 @NotNull(message = "新负责人的用户编号不能为空")
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
  View file @ba1b028
... ... @@ -62,8 +62,6 @@ public class CrmCustomerController {
62 62 private DeptApi deptApi;
63 63 @Resource
64 64 private AdminUserApi adminUserApi;
65   - @Resource
66   - private DictDataApi dictDataApi;
67 65  
68 66 @PostMapping("/create")
69 67 @Operation(summary = "创建客户")
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
  View file @ba1b028
... ... @@ -5,13 +5,15 @@ import io.swagger.v3.oas.annotations.media.Schema;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Data;
7 7  
  8 +import java.util.List;
  9 +
8 10 @Schema(description = "管理后台 - CRM 客户转移 Request VO")
9 11 @Data
10 12 public class CrmCustomerTransferReqVO {
11 13  
12 14 @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
13 15 @NotNull(message = "客户编号不能为空")
14   - private Long id;
  16 + private Long bizId;
15 17  
16 18 /**
17 19 * 新负责人的用户编号
... ... @@ -28,4 +30,10 @@ public class CrmCustomerTransferReqVO {
28 30 @Schema(description = "老负责人加入团队后的权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
29 31 private Integer oldOwnerPermissionLevel;
30 32  
  33 + /**
  34 + * 转移客户时，需要额外有【联系人】【商机】【合同】的 checkbox 选择
  35 + */
  36 + @Schema(description = "同时转移", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  37 + private List<Integer> toBizTypes;
  38 +
31 39 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
  View file @ba1b028
... ... @@ -5,12 +5,19 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
7 7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
8   -import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionCreateReqVO;
9 8 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionRespVO;
  9 +import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionSaveReqVO;
10 10 import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionUpdateReqVO;
  11 +import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
  12 +import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
  13 +import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
11 14 import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
  15 +import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
12 16 import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
13 17 import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPermission;
  18 +import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
  19 +import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
  20 +import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
14 21 import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
15 22 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
16 23 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
... ... @@ -27,13 +34,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
27 34 import jakarta.annotation.Resource;
28 35 import jakarta.validation.Valid;
29 36 import org.springframework.security.access.prepost.PreAuthorize;
  37 +import org.springframework.transaction.annotation.Transactional;
30 38 import org.springframework.validation.annotation.Validated;
31 39 import org.springframework.web.bind.annotation.*;
32 40  
33   -import java.util.Collection;
34   -import java.util.Collections;
35   -import java.util.List;
36   -import java.util.Map;
  41 +import java.util.*;
37 42 import java.util.stream.Stream;
38 43  
39 44 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
... ... @@ -50,7 +55,12 @@ public class CrmPermissionController {
50 55  
51 56 @Resource
52 57 private CrmPermissionService permissionService;
53   -
  58 + @Resource
  59 + private CrmContactService contactService;
  60 + @Resource
  61 + private CrmBusinessService businessService;
  62 + @Resource
  63 + private CrmContractService contractService;
54 64 @Resource
55 65 private AdminUserApi adminUserApi;
56 66 @Resource
... ... @@ -60,13 +70,47 @@ public class CrmPermissionController {
60 70  
61 71 @PostMapping("/create")
62 72 @Operation(summary = "创建数据权限")
  73 + @Transactional(rollbackFor = Exception.class)
63 74 @PreAuthorize("@ss.hasPermission('crm:permission:create')")
64 75 @CrmPermission(bizTypeValue = "#reqVO.bizType", bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
65   - public CommonResult<Boolean> addPermission(@Valid @RequestBody CrmPermissionCreateReqVO reqVO) {
  76 + public CommonResult<Boolean> addPermission(@Valid @RequestBody CrmPermissionSaveReqVO reqVO) {
66 77 permissionService.createPermission(BeanUtils.toBean(reqVO, CrmPermissionCreateReqBO.class));
  78 + if (CollUtil.isNotEmpty(reqVO.getToBizTypes())) {
  79 + createBizTypePermissions(reqVO);
  80 + }
67 81 return success(true);
68 82 }
69 83  
  84 +
  85 + private void createBizTypePermissions(CrmPermissionSaveReqVO reqVO) {
  86 + List<CrmPermissionCreateReqBO> createPermissions = new ArrayList<>();
  87 + if (reqVO.getToBizTypes().contains(CrmBizTypeEnum.CRM_CONTACT.getType())) {
  88 + List<CrmContactDO> contactList = contactService.getContactListByCustomerIdOwnerUserId(reqVO.getBizId(), getLoginUserId());
  89 + contactList.forEach(item -> {
  90 + createPermissions.add(new CrmPermissionCreateReqBO().setBizType(CrmBizTypeEnum.CRM_CONTACT.getType())
  91 + .setBizId(item.getId()).setUserId(reqVO.getUserId()).setLevel(reqVO.getLevel()));
  92 + });
  93 + }
  94 + if (reqVO.getToBizTypes().contains(CrmBizTypeEnum.CRM_BUSINESS.getType())) {
  95 + List<CrmBusinessDO> businessList = businessService.getBusinessListByCustomerIdOwnerUserId(reqVO.getBizId(), getLoginUserId());
  96 + businessList.forEach(item -> {
  97 + createPermissions.add(new CrmPermissionCreateReqBO().setBizType(CrmBizTypeEnum.CRM_BUSINESS.getType())
  98 + .setBizId(item.getId()).setUserId(reqVO.getUserId()).setLevel(reqVO.getLevel()));
  99 + });
  100 + }
  101 + if (reqVO.getToBizTypes().contains(CrmBizTypeEnum.CRM_CONTRACT.getType())) {
  102 + List<CrmContractDO> contractList = contractService.getContractListByCustomerIdOwnerUserId(reqVO.getBizId(), getLoginUserId());
  103 + contractList.forEach(item -> {
  104 + createPermissions.add(new CrmPermissionCreateReqBO().setBizType(CrmBizTypeEnum.CRM_CONTRACT.getType())
  105 + .setBizId(item.getId()).setUserId(reqVO.getUserId()).setLevel(reqVO.getLevel()));
  106 + });
  107 + }
  108 + if (CollUtil.isEmpty(createPermissions)) {
  109 + return;
  110 + }
  111 + permissionService.createPermissionBatch(createPermissions);
  112 + }
  113 +
70 114 @PutMapping("/update")
71 115 @Operation(summary = "编辑数据权限")
72 116 @PreAuthorize("@ss.hasPermission('crm:permission:update')")
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionCreateReqVO.java deleted
View file @f56fab9
1   -package cn.iocoder.yudao.module.crm.controller.admin.permission.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -import lombok.EqualsAndHashCode;
6   -import lombok.ToString;
7   -
8   -@Schema(description = "管理后台 - CRM 数据权限创建 Request VO")
9   -@Data
10   -@EqualsAndHashCode(callSuper = true)
11   -@ToString(callSuper = true)
12   -public class CrmPermissionCreateReqVO extends CrmPermissionBaseVO {
13   -
14   -}
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionRespVO.java
  View file @ba1b028
1 1 package cn.iocoder.yudao.module.crm.controller.admin.permission.vo;
2 2  
  3 +import cn.iocoder.yudao.framework.common.validation.InEnum;
  4 +import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
  5 +import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
3 6 import io.swagger.v3.oas.annotations.media.Schema;
  7 +import jakarta.validation.constraints.NotNull;
4 8 import lombok.Data;
5 9  
6 10 import java.time.LocalDateTime;
... ... @@ -8,11 +12,29 @@ import java.util.Set;
8 12  
9 13 @Schema(description = "管理后台 - CRM 数据权限 Response VO")
10 14 @Data
11   -public class CrmPermissionRespVO extends CrmPermissionBaseVO {
  15 +public class CrmPermissionRespVO {
12 16  
13 17 @Schema(description = "数据权限编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
14 18 private Long id;
15 19  
  20 + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
  21 + @NotNull(message = "用户编号不能为空")
  22 + private Long userId;
  23 +
  24 + @Schema(description = "CRM 类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  25 + @InEnum(CrmBizTypeEnum.class)
  26 + @NotNull(message = "CRM 类型不能为空")
  27 + private Integer bizType;
  28 +
  29 + @Schema(description = "CRM 类型数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  30 + @NotNull(message = "CRM 类型数据编号不能为空")
  31 + private Long bizId;
  32 +
  33 + @Schema(description = "权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  34 + @InEnum(CrmPermissionLevelEnum.class)
  35 + @NotNull(message = "权限级别不能为空")
  36 + private Integer level;
  37 +
16 38 @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
17 39 private String nickname;
18 40  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionBaseVO.java renamed to yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionSaveReqVO.java
  View file @ba1b028
... ... @@ -8,14 +8,11 @@ import lombok.Data;
8 8  
9 9 import jakarta.validation.constraints.NotNull;
10 10  
11   -/**
12   - * 数据权限 Base VO，提供给添加、修改、详细的子 VO 使用
13   - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
14   - *
15   - * @author HUIHUI
16   - */
  11 +import java.util.List;
  12 +
  13 +@Schema(description = "管理后台 - CRM 数据权限创建/更新 Request VO")
17 14 @Data
18   -public class CrmPermissionBaseVO {
  15 +public class CrmPermissionSaveReqVO {
19 16  
20 17 @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
21 18 @NotNull(message = "用户编号不能为空")
... ... @@ -35,4 +32,10 @@ public class CrmPermissionBaseVO {
35 32 @NotNull(message = "权限级别不能为空")
36 33 private Integer level;
37 34  
  35 + /**
  36 + * 添加客户团队成员时，需要额外有【联系人】【商机】【合同】的 checkbox 选择
  37 + */
  38 + @Schema(description = "同时添加", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
  39 + private List<Integer> toBizTypes;
  40 +
38 41 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java
  View file @ba1b028
... ... @@ -6,12 +6,14 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
7 7 import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessPageReqVO;
8 8 import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
  9 +import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
9 10 import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
10 11 import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
11 12 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
12 13 import org.apache.ibatis.annotations.Mapper;
13 14  
14 15 import java.util.Collection;
  16 +import java.util.List;
15 17  
16 18 /**
17 19 * 商机 Mapper
... ... @@ -57,4 +59,10 @@ public interface CrmBusinessMapper extends BaseMapperX&lt;CrmBusinessDO&gt; {
57 59 return selectCount(CrmBusinessDO::getStatusTypeId, statusTypeId);
58 60 }
59 61  
  62 + default List<CrmBusinessDO> selectListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId){
  63 + return selectList(new LambdaQueryWrapperX<CrmBusinessDO>()
  64 + .eq(CrmBusinessDO::getCustomerId, customerId)
  65 + .eq(CrmBusinessDO::getOwnerUserId, ownerUserId));
  66 + }
  67 +
60 68 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contact/CrmContactMapper.java
  View file @ba1b028
... ... @@ -73,4 +73,10 @@ public interface CrmContactMapper extends BaseMapperX&lt;CrmContactDO&gt; {
73 73 return selectList(CrmContactDO::getCustomerId, customerId);
74 74 }
75 75  
  76 + default List<CrmContactDO> selectListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
  77 + return selectList(new LambdaQueryWrapperX<CrmContactDO>()
  78 + .eq(CrmContactDO::getCustomerId, customerId)
  79 + .eq(CrmContactDO::getOwnerUserId, ownerUserId));
  80 + }
  81 +
76 82 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/contract/CrmContractMapper.java
  View file @ba1b028
... ... @@ -117,4 +117,10 @@ public interface CrmContractMapper extends BaseMapperX&lt;CrmContractDO&gt; {
117 117 return selectCount(query);
118 118 }
119 119  
  120 + default List<CrmContractDO> selectListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
  121 + return selectList(new LambdaQueryWrapperX<CrmContractDO>()
  122 + .eq(CrmContractDO::getCustomerId, customerId)
  123 + .eq(CrmContractDO::getOwnerUserId, ownerUserId));
  124 + }
  125 +
120 126 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java
  View file @ba1b028
... ... @@ -46,8 +46,8 @@ public interface CrmBusinessService {
46 46 /**
47 47 * 更新商机相关跟进信息
48 48 *
49   - * @param id 编号
50   - * @param contactNextTime 下次联系时间
  49 + * @param id 编号
  50 + * @param contactNextTime 下次联系时间
51 51 * @param contactLastContent 最后联系内容
52 52 */
53 53 void updateBusinessFollowUp(Long id, LocalDateTime contactNextTime, String contactLastContent);
... ... @@ -55,7 +55,7 @@ public interface CrmBusinessService {
55 55 /**
56 56 * 更新商机的下次联系时间
57 57 *
58   - * @param ids 编号数组
  58 + * @param ids 编号数组
59 59 * @param contactNextTime 下次联系时间
60 60 */
61 61 void updateBusinessContactNextTime(Collection<Long> ids, LocalDateTime contactNextTime);
... ... @@ -185,4 +185,13 @@ public interface CrmBusinessService {
185 185 return status.getName();
186 186 }
187 187  
  188 + /**
  189 + * 获得商机列表
  190 + *
  191 + * @param customerId 客户编号
  192 + * @param ownerUserId 负责人编号
  193 + * @return 商机列表
  194 + */
  195 + List<CrmBusinessDO> getBusinessListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId);
  196 +
188 197 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java
  View file @ba1b028
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.crm.service.business;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.collection.ListUtil;
  5 +import cn.hutool.extra.spring.SpringUtil;
5 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 7 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
7 8 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
... ... @@ -23,6 +24,7 @@ import cn.iocoder.yudao.module.crm.service.contact.CrmContactBusinessService;
23 24 import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
24 25 import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
25 26 import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
  27 +import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerServiceImpl;
26 28 import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
27 29 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
28 30 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
... ... @@ -204,7 +206,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
204 206  
205 207 private List<CrmBusinessProductDO> validateBusinessProducts(List<CrmBusinessSaveReqVO.Product> list) {
206 208 // 1. 校验产品存在
207   - productService.validProductList(convertSet(list, CrmBusinessSaveReqVO.Product::getProductId));
  209 + productService.validProductList(convertSet(list, CrmBusinessSaveReqVO.Product::getProductId));
208 210 // 2. 转化为 CrmBusinessProductDO 列表
209 211 return convertList(list, o -> BeanUtils.toBean(o, CrmBusinessProductDO.class,
210 212 item -> item.setTotalPrice(MoneyUtils.priceMultiply(item.getBusinessPrice(), item.getCount()))));
... ... @@ -234,7 +236,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
234 236 }
235 237 // 1.4 校验是不是状态没变更
236 238 if ((reqVO.getStatusId() != null && reqVO.getStatusId().equals(business.getStatusId()))
237   - || (reqVO.getEndStatus() != null && reqVO.getEndStatus().equals(business.getEndStatus()))) {
  239 + || (reqVO.getEndStatus() != null && reqVO.getEndStatus().equals(business.getEndStatus()))) {
238 240 throw exception(BUSINESS_UPDATE_STATUS_FAIL_STATUS_EQUALS);
239 241 }
240 242  
... ... @@ -292,18 +294,18 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
292 294  
293 295 @Override
294 296 @Transactional(rollbackFor = Exception.class)
295   - @LogRecord(type = CRM_BUSINESS_TYPE, subType = CRM_BUSINESS_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.id}}",
  297 + @LogRecord(type = CRM_BUSINESS_TYPE, subType = CRM_BUSINESS_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.bizId}}",
296 298 success = CRM_BUSINESS_TRANSFER_SUCCESS)
297   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_BUSINESS, bizId = "#reqVO.id", level = CrmPermissionLevelEnum.OWNER)
  299 + @CrmPermission(bizType = CrmBizTypeEnum.CRM_BUSINESS, bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
298 300 public void transferBusiness(CrmBusinessTransferReqVO reqVO, Long userId) {
299 301 // 1 校验商机是否存在
300   - CrmBusinessDO business = validateBusinessExists(reqVO.getId());
  302 + CrmBusinessDO business = validateBusinessExists(reqVO.getBizId());
301 303  
302 304 // 2.1 数据权限转移
303 305 permissionService.transferPermission(new CrmPermissionTransferReqBO(userId, CrmBizTypeEnum.CRM_BUSINESS.getType(),
304   - reqVO.getNewOwnerUserId(), reqVO.getId(), CrmPermissionLevelEnum.OWNER.getLevel()));
  306 + reqVO.getBizId(), reqVO.getNewOwnerUserId(), CrmPermissionLevelEnum.OWNER.getLevel()));
305 307 // 2.2 设置新的负责人
306   - businessMapper.updateOwnerUserIdById(reqVO.getId(), reqVO.getNewOwnerUserId());
  308 + businessMapper.updateOwnerUserIdById(reqVO.getBizId(), reqVO.getNewOwnerUserId());
307 309  
308 310 // 记录操作日志上下文
309 311 LogRecordContext.putVariable("business", business);
... ... @@ -370,4 +372,9 @@ public class CrmBusinessServiceImpl implements CrmBusinessService {
370 372 return businessMapper.selectCountByStatusTypeId(statusTypeId);
371 373 }
372 374  
  375 + @Override
  376 + public List<CrmBusinessDO> getBusinessListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
  377 + return businessMapper.selectListByCustomerIdOwnerUserId(customerId, ownerUserId);
  378 + }
  379 +
373 380 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
  View file @ba1b028
... ... @@ -159,18 +159,18 @@ public class CrmClueServiceImpl implements CrmClueService {
159 159  
160 160 @Override
161 161 @Transactional(rollbackFor = Exception.class)
162   - @LogRecord(type = CRM_CLUE_TYPE, subType = CRM_CLUE_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.id}}",
  162 + @LogRecord(type = CRM_CLUE_TYPE, subType = CRM_CLUE_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.bizId}}",
163 163 success = CRM_CLUE_TRANSFER_SUCCESS)
164   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_CLUE, bizId = "#reqVO.id", level = CrmPermissionLevelEnum.OWNER)
  164 + @CrmPermission(bizType = CrmBizTypeEnum.CRM_CLUE, bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
165 165 public void transferClue(CrmClueTransferReqVO reqVO, Long userId) {
166 166 // 1 校验线索是否存在
167   - CrmClueDO clue = validateClueExists(reqVO.getId());
  167 + CrmClueDO clue = validateClueExists(reqVO.getBizId());
168 168  
169 169 // 2.1 数据权限转移
170 170 crmPermissionService.transferPermission(new CrmPermissionTransferReqBO(userId, CrmBizTypeEnum.CRM_CLUE.getType(),
171   - reqVO.getId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
  171 + reqVO.getBizId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
172 172 // 2.2 设置新的负责人
173   - clueMapper.updateById(new CrmClueDO().setId(reqVO.getId()).setOwnerUserId(reqVO.getNewOwnerUserId()));
  173 + clueMapper.updateById(new CrmClueDO().setId(reqVO.getBizId()).setOwnerUserId(reqVO.getNewOwnerUserId()));
174 174  
175 175 // 3. 记录转移日志
176 176 LogRecordContext.putVariable("clue", clue);
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactService.java
  View file @ba1b028
... ... @@ -75,8 +75,8 @@ public interface CrmContactService {
75 75 /**
76 76 * 更新联系人的下次联系时间
77 77 *
78   - * @param ids 编号数组
79   - * @param contactNextTime 下次联系时间
  78 + * @param ids 编号数组
  79 + * @param contactNextTime 下次联系时间
80 80 */
81 81 void updateContactContactNextTime(Collection<Long> ids, LocalDateTime contactNextTime);
82 82  
... ... @@ -160,4 +160,13 @@ public interface CrmContactService {
160 160 */
161 161 Long getContactCountByCustomerId(Long customerId);
162 162  
  163 + /**
  164 + * 获得联系人列表
  165 + *
  166 + * @param customerId 客户编号
  167 + * @param ownerUserId 负责人编号
  168 + * @return 联系人列表
  169 + */
  170 + List<CrmContactDO> getContactListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId);
  171 +
163 172 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/CrmContactServiceImpl.java
  View file @ba1b028
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.crm.service.contact;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.collection.ListUtil;
  5 +import cn.hutool.extra.spring.SpringUtil;
5 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 8 import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.CrmContactBusinessReqVO;
... ... @@ -17,6 +18,7 @@ import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPerm
17 18 import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
18 19 import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
19 20 import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
  21 +import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerServiceImpl;
20 22 import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
21 23 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
22 24 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
... ... @@ -177,18 +179,18 @@ public class CrmContactServiceImpl implements CrmContactService {
177 179  
178 180 @Override
179 181 @Transactional(rollbackFor = Exception.class)
180   - @LogRecord(type = CRM_CONTACT_TYPE, subType = CRM_CONTACT_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.id}}",
  182 + @LogRecord(type = CRM_CONTACT_TYPE, subType = CRM_CONTACT_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.bizId}}",
181 183 success = CRM_CONTACT_TRANSFER_SUCCESS)
182   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTACT, bizId = "#reqVO.id", level = CrmPermissionLevelEnum.OWNER)
  184 + @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTACT, bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
183 185 public void transferContact(CrmContactTransferReqVO reqVO, Long userId) {
184 186 // 1 校验联系人是否存在
185   - CrmContactDO contact = validateContactExists(reqVO.getId());
  187 + CrmContactDO contact = validateContactExists(reqVO.getBizId());
186 188  
187 189 // 2.1 数据权限转移
188 190 permissionService.transferPermission(new CrmPermissionTransferReqBO(userId, CrmBizTypeEnum.CRM_CONTACT.getType(),
189   - reqVO.getId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
  191 + reqVO.getBizId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
190 192 // 2.2 设置新的负责人
191   - contactMapper.updateById(new CrmContactDO().setId(reqVO.getId()).setOwnerUserId(reqVO.getNewOwnerUserId()));
  193 + contactMapper.updateById(new CrmContactDO().setId(reqVO.getBizId()).setOwnerUserId(reqVO.getNewOwnerUserId()));
192 194  
193 195 // 3. 记录转移日志
194 196 LogRecordContext.putVariable("contact", contact);
... ... @@ -298,4 +300,9 @@ public class CrmContactServiceImpl implements CrmContactService {
298 300 return contactMapper.selectCount(CrmContactDO::getCustomerId, customerId);
299 301 }
300 302  
  303 + @Override
  304 + public List<CrmContactDO> getContactListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
  305 + return contactMapper.selectListByCustomerIdOwnerUserId(customerId, ownerUserId);
  306 + }
  307 +
301 308 }
302 309 \ No newline at end of file
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractService.java
  View file @ba1b028
... ... @@ -58,8 +58,8 @@ public interface CrmContractService {
58 58 /**
59 59 * 更新合同相关的更进信息
60 60 *
61   - * @param id 合同编号
62   - * @param contactNextTime 下次联系时间
  61 + * @param id 合同编号
  62 + * @param contactNextTime 下次联系时间
63 63 * @param contactLastContent 最后联系内容
64 64 */
65 65 void updateContractFollowUp(Long id, LocalDateTime contactNextTime, String contactLastContent);
... ... @@ -75,7 +75,7 @@ public interface CrmContractService {
75 75 /**
76 76 * 更新合同流程审批结果
77 77 *
78   - * @param id 合同编号
  78 + * @param id 合同编号
79 79 * @param bpmResult BPM 审批结果
80 80 */
81 81 void updateContractAuditStatus(Long id, Integer bpmResult);
... ... @@ -193,4 +193,13 @@ public interface CrmContractService {
193 193 */
194 194 Long getRemindContractCount(Long userId);
195 195  
  196 + /**
  197 + * 获得合同列表
  198 + *
  199 + * @param customerId 客户编号
  200 + * @param ownerUserId 负责人编号
  201 + * @return 合同列表
  202 + */
  203 + List<CrmContractDO> getContractListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId);
  204 +
196 205 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java
  View file @ba1b028
... ... @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.collection.ListUtil;
5 5 import cn.hutool.core.lang.Assert;
6 6 import cn.hutool.core.util.ObjUtil;
  7 +import cn.hutool.extra.spring.SpringUtil;
7 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 9 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
9 10 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
... ... @@ -26,6 +27,7 @@ import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPerm
26 27 import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
27 28 import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
28 29 import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
  30 +import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerServiceImpl;
29 31 import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
30 32 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
31 33 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
... ... @@ -252,18 +254,18 @@ public class CrmContractServiceImpl implements CrmContractService {
252 254  
253 255 @Override
254 256 @Transactional(rollbackFor = Exception.class)
255   - @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.id}}",
  257 + @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.bizId}}",
256 258 success = CRM_CONTRACT_TRANSFER_SUCCESS)
257   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#reqVO.id", level = CrmPermissionLevelEnum.OWNER)
  259 + @CrmPermission(bizType = CrmBizTypeEnum.CRM_CONTRACT, bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
258 260 public void transferContract(CrmContractTransferReqVO reqVO, Long userId) {
259 261 // 1. 校验合同是否存在
260   - CrmContractDO contract = validateContractExists(reqVO.getId());
  262 + CrmContractDO contract = validateContractExists(reqVO.getBizId());
261 263  
262 264 // 2.1 数据权限转移
263 265 crmPermissionService.transferPermission(new CrmPermissionTransferReqBO(userId, CrmBizTypeEnum.CRM_CONTRACT.getType(),
264   - reqVO.getId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
  266 + reqVO.getBizId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
265 267 // 2.2 设置负责人
266   - contractMapper.updateById(new CrmContractDO().setId(reqVO.getId()).setOwnerUserId(reqVO.getNewOwnerUserId()));
  268 + contractMapper.updateById(new CrmContractDO().setId(reqVO.getBizId()).setOwnerUserId(reqVO.getNewOwnerUserId()));
267 269  
268 270 // 3. 记录转移日志
269 271 LogRecordContext.putVariable("contract", contract);
... ... @@ -407,4 +409,9 @@ public class CrmContractServiceImpl implements CrmContractService {
407 409 return contractMapper.selectCountByRemind(userId, config);
408 410 }
409 411  
  412 + @Override
  413 + public List<CrmContractDO> getContractListByCustomerIdOwnerUserId(Long customerId, Long ownerUserId) {
  414 + return contractMapper.selectListByCustomerIdOwnerUserId(customerId, ownerUserId);
  415 + }
  416 +
410 417 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java
  View file @ba1b028
... ... @@ -9,7 +9,13 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException;
9 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10 10 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
11 11 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  12 +import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessTransferReqVO;
  13 +import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.CrmContactTransferReqVO;
  14 +import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractTransferReqVO;
12 15 import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer.*;
  16 +import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
  17 +import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
  18 +import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
13 19 import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
14 20 import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerLimitConfigDO;
15 21 import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerPoolConfigDO;
... ... @@ -193,26 +199,60 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
193 199  
194 200 @Override
195 201 @Transactional(rollbackFor = Exception.class)
196   - @LogRecord(type = CRM_CUSTOMER_TYPE, subType = CRM_CUSTOMER_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.id}}",
  202 + @LogRecord(type = CRM_CUSTOMER_TYPE, subType = CRM_CUSTOMER_TRANSFER_SUB_TYPE, bizNo = "{{#reqVO.bizId}}",
197 203 success = CRM_CUSTOMER_TRANSFER_SUCCESS)
198   - @CrmPermission(bizType = CrmBizTypeEnum.CRM_CUSTOMER, bizId = "#reqVO.id", level = CrmPermissionLevelEnum.OWNER)
  204 + @CrmPermission(bizType = CrmBizTypeEnum.CRM_CUSTOMER, bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
199 205 public void transferCustomer(CrmCustomerTransferReqVO reqVO, Long userId) {
200 206 // 1.1 校验客户是否存在
201   - CrmCustomerDO customer = validateCustomerExists(reqVO.getId());
  207 + CrmCustomerDO customer = validateCustomerExists(reqVO.getBizId());
202 208 // 1.2 校验拥有客户是否到达上限
203 209 validateCustomerExceedOwnerLimit(reqVO.getNewOwnerUserId(), 1);
204   -
205 210 // 2.1 数据权限转移
206 211 permissionService.transferPermission(new CrmPermissionTransferReqBO(userId, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
207   - reqVO.getId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
  212 + reqVO.getBizId(), reqVO.getNewOwnerUserId(), reqVO.getOldOwnerPermissionLevel()));
208 213 // 2.2 转移后重新设置负责人
209   - customerMapper.updateById(new CrmCustomerDO().setId(reqVO.getId())
  214 + customerMapper.updateById(new CrmCustomerDO().setId(reqVO.getBizId())
210 215 .setOwnerUserId(reqVO.getNewOwnerUserId()).setOwnerTime(LocalDateTime.now()));
211 216  
  217 + // 2.3 同时转移
  218 + if (CollUtil.isNotEmpty(reqVO.getToBizTypes())) {
  219 + transfer(reqVO, userId);
  220 + }
  221 +
212 222 // 3. 记录转移日志
213 223 LogRecordContext.putVariable("customer", customer);
214 224 }
215 225  
  226 + /**
  227 + * 转移客户时，需要额外有【联系人】【商机】【合同】
  228 + *
  229 + * @param reqVO 请求
  230 + * @param userId 用户编号
  231 + */
  232 + private void transfer(CrmCustomerTransferReqVO reqVO, Long userId) {
  233 + if (reqVO.getToBizTypes().contains(CrmBizTypeEnum.CRM_CONTACT.getType())) {
  234 + List<CrmContactDO> contactList = contactService.getContactListByCustomerIdOwnerUserId(reqVO.getBizId(), userId);
  235 + contactList.forEach(item -> {
  236 + contactService.transferContact(new CrmContactTransferReqVO(item.getId(), reqVO.getNewOwnerUserId(),
  237 + reqVO.getOldOwnerPermissionLevel()), userId);
  238 + });
  239 + }
  240 + if (reqVO.getToBizTypes().contains(CrmBizTypeEnum.CRM_BUSINESS.getType())) {
  241 + List<CrmBusinessDO> businessList = businessService.getBusinessListByCustomerIdOwnerUserId(reqVO.getBizId(), userId);
  242 + businessList.forEach(item -> {
  243 + businessService.transferBusiness(new CrmBusinessTransferReqVO(item.getId(), reqVO.getNewOwnerUserId(),
  244 + reqVO.getOldOwnerPermissionLevel()), userId);
  245 + });
  246 + }
  247 + if (reqVO.getToBizTypes().contains(CrmBizTypeEnum.CRM_CONTRACT.getType())) {
  248 + List<CrmContractDO> contractList = contractService.getContractListByCustomerIdOwnerUserId(reqVO.getBizId(), userId);
  249 + contractList.forEach(item -> {
  250 + contractService.transferContract(new CrmContractTransferReqVO(item.getId(), reqVO.getNewOwnerUserId(),
  251 + reqVO.getOldOwnerPermissionLevel()), userId);
  252 + });
  253 + }
  254 + }
  255 +
216 256 @Override
217 257 @LogRecord(type = CRM_CUSTOMER_TYPE, subType = CRM_CUSTOMER_LOCK_SUB_TYPE, bizNo = "{{#lockReqVO.id}}",
218 258 success = CRM_CUSTOMER_LOCK_SUCCESS)
... ...