BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 81f838c5d251e69fa6cc38e51a92040674d6c73d

Authored by min
1 parent 4d68e5e7

CRM：【线索】创建、更新线索时添加校验，改用相同vo

Inline Side-by-side
Showing 8 changed files with 100 additions and 57 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
  View file @81f838c
... ... @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 6 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 7 import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.*;
  8 +import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.CrmContactSaveReqVO;
8 9 import cn.iocoder.yudao.module.crm.convert.clue.CrmClueConvert;
9 10 import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
10 11 import cn.iocoder.yudao.module.crm.service.clue.CrmClueService;
... ... @@ -38,14 +39,14 @@ public class CrmClueController {
38 39 @PostMapping("/create")
39 40 @Operation(summary = "创建线索")
40 41 @PreAuthorize("@ss.hasPermission('crm:clue:create')")
41   - public CommonResult<Long> createClue(@Valid @RequestBody CrmClueCreateReqVO createReqVO) {
  42 + public CommonResult<Long> createClue(@Valid @RequestBody CrmClueSaveReqVO createReqVO) {
42 43 return success(clueService.createClue(createReqVO));
43 44 }
44 45  
45 46 @PutMapping("/update")
46 47 @Operation(summary = "更新线索")
47 48 @PreAuthorize("@ss.hasPermission('crm:clue:update')")
48   - public CommonResult<Boolean> updateClue(@Valid @RequestBody CrmClueUpdateReqVO updateReqVO) {
  49 + public CommonResult<Boolean> updateClue(@Valid @RequestBody CrmClueSaveReqVO updateReqVO) {
49 50 clueService.updateClue(updateReqVO);
50 51 return success(true);
51 52 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueCreateReqVO.java deleted
View file @4d68e5e
1   -package cn.iocoder.yudao.module.crm.controller.admin.clue.vo;
2   -
3   -import lombok.*;
4   -import java.util.*;
5   -import io.swagger.v3.oas.annotations.media.Schema;
6   -import jakarta.validation.constraints.*;
7   -
8   -@Schema(description = "管理后台 - 线索创建 Request VO")
9   -@Data
10   -@EqualsAndHashCode(callSuper = true)
11   -@ToString(callSuper = true)
12   -public class CrmClueCreateReqVO extends CrmClueBaseVO {
13   -
14   -}
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java 0 → 100644
  View file @81f838c
  1 +package cn.iocoder.yudao.module.crm.controller.admin.clue.vo;
  2 +
  3 +import cn.iocoder.yudao.framework.common.validation.Mobile;
  4 +import cn.iocoder.yudao.framework.common.validation.Telephone;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import jakarta.validation.constraints.NotEmpty;
  7 +import jakarta.validation.constraints.NotNull;
  8 +import lombok.Data;
  9 +import lombok.EqualsAndHashCode;
  10 +import lombok.ToString;
  11 +import org.springframework.format.annotation.DateTimeFormat;
  12 +
  13 +import java.time.LocalDateTime;
  14 +
  15 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  16 +
  17 +/**
  18 + * @author minhx
  19 + */
  20 +@Schema(description = "管理后台 - CRM 线索 创建/更新 Request VO")
  21 +@Data
  22 +public class CrmClueSaveReqVO {
  23 +
  24 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10969")
  25 + private Long id;
  26 +
  27 + @Schema(description = "线索名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "线索xxx")
  28 + @NotEmpty(message = "线索名称不能为空")
  29 + private String name;
  30 +
  31 + @Schema(description = "客户 id", requiredMode = Schema.RequiredMode.REQUIRED, example = "520")
  32 + private Long customerId;
  33 +
  34 + @Schema(description = "下次联系时间", example = "2023-10-18 01:00:00")
  35 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  36 + private LocalDateTime contactNextTime;
  37 +
  38 + @Schema(description = "电话", example = "18000000000")
  39 + @Telephone
  40 + private String telephone;
  41 +
  42 + @Schema(description = "手机号", example = "18000000000")
  43 + @Mobile
  44 + private String mobile;
  45 +
  46 + @Schema(description = "地址", example = "北京市海淀区")
  47 + private String address;
  48 +
  49 + @Schema(description = "最后跟进时间")
  50 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  51 + private LocalDateTime contactLastTime;
  52 +
  53 + @Schema(description = "负责人编号")
  54 + private Long ownerUserId;
  55 +
  56 + @Schema(description = "备注", example = "随便")
  57 + private String remark;
  58 +}
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueUpdateReqVO.java deleted
View file @4d68e5e
1   -package cn.iocoder.yudao.module.crm.controller.admin.clue.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   -import jakarta.validation.constraints.NotNull;
9   -
10   -@Schema(description = "管理后台 - 线索更新 Request VO")
11   -@Data
12   -@EqualsAndHashCode(callSuper = true)
13   -@ToString(callSuper = true)
14   -public class CrmClueUpdateReqVO extends CrmClueBaseVO {
15   -
16   - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10969")
17   - @NotNull(message = "编号不能为空")
18   - private Long id;
19   -
20   -}
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/clue/CrmClueConvert.java
  View file @81f838c
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.crm.convert.clue;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.*;
  5 +import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.CrmContactSaveReqVO;
5 6 import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
6 7 import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionTransferReqBO;
7 8 import org.mapstruct.Mapper;
... ... @@ -20,9 +21,7 @@ public interface CrmClueConvert {
20 21  
21 22 CrmClueConvert INSTANCE = Mappers.getMapper(CrmClueConvert.class);
22 23  
23   - CrmClueDO convert(CrmClueCreateReqVO bean);
24   -
25   - CrmClueDO convert(CrmClueUpdateReqVO bean);
  24 + CrmClueDO convert(CrmClueSaveReqVO bean);
26 25  
27 26 CrmClueRespVO convert(CrmClueDO bean);
28 27  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueService.java
  View file @81f838c
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.crm.service.clue;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.*;
  5 +import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.CrmContactSaveReqVO;
5 6 import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
6 7 import jakarta.validation.Valid;
7 8  
... ... @@ -21,14 +22,14 @@ public interface CrmClueService {
21 22 * @param createReqVO 创建信息
22 23 * @return 编号
23 24 */
24   - Long createClue(@Valid CrmClueCreateReqVO createReqVO);
  25 + Long createClue(@Valid CrmClueSaveReqVO createReqVO);
25 26  
26 27 /**
27 28 * 更新线索
28 29 *
29 30 * @param updateReqVO 更新信息
30 31 */
31   - void updateClue(@Valid CrmClueUpdateReqVO updateReqVO);
  32 + void updateClue(@Valid CrmClueSaveReqVO updateReqVO);
32 33  
33 34 /**
34 35 * 删除线索
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImpl.java
  View file @81f838c
... ... @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.collection.ListUtil;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.*;
  7 +import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.CrmContactSaveReqVO;
7 8 import cn.iocoder.yudao.module.crm.convert.clue.CrmClueConvert;
8 9 import cn.iocoder.yudao.module.crm.convert.customer.CrmCustomerConvert;
9 10 import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
... ... @@ -13,6 +14,7 @@ import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
13 14 import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPermission;
14 15 import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
15 16 import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
  17 +import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
16 18 import jakarta.annotation.Resource;
17 19 import org.springframework.stereotype.Service;
18 20 import org.springframework.transaction.annotation.Transactional;
... ... @@ -24,6 +26,8 @@ import java.util.Objects;
24 26  
25 27 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
26 28 import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CLUE_NOT_EXISTS;
  29 +import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CUSTOMER_NOT_EXISTS;
  30 +import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.USER_NOT_EXISTS;
27 31  
28 32 /**
29 33 * 线索 Service 实现类
... ... @@ -39,15 +43,18 @@ public class CrmClueServiceImpl implements CrmClueService {
39 43  
40 44 @Resource
41 45 private CrmCustomerService customerService;
  46 +
42 47 @Resource
43 48 private CrmPermissionService crmPermissionService;
44 49  
  50 + @Resource
  51 + private AdminUserApi adminUserApi;
  52 +
45 53 @Override
46   - public Long createClue(CrmClueCreateReqVO createReqVO) {
47   - // 如果传入客户，校验客户是否存在
48   - if (Objects.nonNull(createReqVO.getCustomerId())) {
49   - customerService.validateCustomer(createReqVO.getCustomerId());
50   - }
  54 + public Long createClue(CrmClueSaveReqVO createReqVO) {
  55 + // 校验关联数据
  56 + validateRelationDataExists(createReqVO);
  57 +
51 58 // 插入
52 59 CrmClueDO clue = CrmClueConvert.INSTANCE.convert(createReqVO);
53 60 clueMapper.insert(clue);
... ... @@ -58,13 +65,11 @@ public class CrmClueServiceImpl implements CrmClueService {
58 65  
59 66 @Override
60 67 @CrmPermission(bizType = CrmBizTypeEnum.CRM_LEADS, bizId = "#updateReqVO.id", level = CrmPermissionLevelEnum.WRITE)
61   - public void updateClue(CrmClueUpdateReqVO updateReqVO) {
62   - // 校验存在
  68 + public void updateClue(CrmClueSaveReqVO updateReqVO) {
  69 + // 校验线索是否存在
63 70 validateClueExists(updateReqVO.getId());
64   - // 如果传入客户，校验客户是否存在
65   - if (Objects.nonNull(updateReqVO.getCustomerId())) {
66   - customerService.validateCustomer(updateReqVO.getCustomerId());
67   - }
  71 + // 校验关联数据
  72 + validateRelationDataExists(updateReqVO);
68 73  
69 74 // 更新
70 75 CrmClueDO updateObj = CrmClueConvert.INSTANCE.convert(updateReqVO);
... ... @@ -137,4 +142,18 @@ public class CrmClueServiceImpl implements CrmClueService {
137 142 clueMapper.updateById(clueDO);
138 143 });
139 144 }
  145 +
  146 + private void validateRelationDataExists(CrmClueSaveReqVO reqVO) {
  147 + // 校验客户
  148 + if (Objects.nonNull(reqVO.getCustomerId()) &&
  149 + Objects.isNull(customerService.getCustomer(reqVO.getCustomerId()))) {
  150 + throw exception(CUSTOMER_NOT_EXISTS);
  151 + }
  152 + // 校验负责人
  153 + // 2. 校验负责人
  154 + if (Objects.nonNull(reqVO.getOwnerUserId()) &&
  155 + Objects.isNull(adminUserApi.getUser(reqVO.getOwnerUserId()))) {
  156 + throw exception(USER_NOT_EXISTS);
  157 + }
  158 + }
140 159 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/clue/CrmClueServiceImplTest.java
  View file @81f838c
... ... @@ -2,9 +2,8 @@ package cn.iocoder.yudao.module.crm.service.clue;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
5   -import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmClueCreateReqVO;
6 5 import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmCluePageReqVO;
7   -import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmClueUpdateReqVO;
  6 +import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmClueSaveReqVO;
8 7 import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
9 8 import cn.iocoder.yudao.module.crm.dal.mysql.clue.CrmClueMapper;
10 9 import jakarta.annotation.Resource;
... ... @@ -43,7 +42,7 @@ public class CrmClueServiceImplTest extends BaseDbUnitTest {
43 42 @Test
44 43 public void testCreateClue_success() {
45 44 // 准备参数
46   - CrmClueCreateReqVO reqVO = randomPojo(CrmClueCreateReqVO.class);
  45 + CrmClueSaveReqVO reqVO = randomPojo(CrmClueSaveReqVO.class);
47 46  
48 47 // 调用
49 48 Long clueId = clueService.createClue(reqVO);
... ... @@ -60,7 +59,7 @@ public class CrmClueServiceImplTest extends BaseDbUnitTest {
60 59 CrmClueDO dbClue = randomPojo(CrmClueDO.class);
61 60 clueMapper.insert(dbClue);// @Sql: 先插入出一条存在的数据
62 61 // 准备参数
63   - CrmClueUpdateReqVO reqVO = randomPojo(CrmClueUpdateReqVO.class, o -> {
  62 + CrmClueSaveReqVO reqVO = randomPojo(CrmClueSaveReqVO.class, o -> {
64 63 o.setId(dbClue.getId()); // 设置更新的 ID
65 64 });
66 65  
... ... @@ -74,7 +73,7 @@ public class CrmClueServiceImplTest extends BaseDbUnitTest {
74 73 @Test
75 74 public void testUpdateClue_notExists() {
76 75 // 准备参数
77   - CrmClueUpdateReqVO reqVO = randomPojo(CrmClueUpdateReqVO.class);
  76 + CrmClueSaveReqVO reqVO = randomPojo(CrmClueSaveReqVO.class);
78 77  
79 78 // 调用, 并断言异常
80 79 assertServiceException(() -> clueService.updateClue(reqVO), CLUE_NOT_EXISTS);
... ...