From 722e9c8a044c9deea0cdf4e3f316bb5fbcc91c7f Mon Sep 17 00:00:00 2001 From: puhui999 Date: Sun, 29 Oct 2023 02:04:26 +0800 Subject: [PATCH] =?UTF-8?q?CRM-=E5=95=86=E6=9C=BA=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=95=86=E6=9C=BA=E8=BD=AC=E7=A7=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/crm/enums/ErrorCodeConstants.java | 2 + .../admin/business/CrmBusinessController.java | 11 ++++- .../business/vo/CrmBusinessCreateReqVO.java | 9 ++++ .../business/vo/CrmBusinessTransferReqVO.java | 20 +++++++++ .../business/vo/CrmBusinessUpdateReqVO.java | 8 ++++ .../contact/vo/CrmContactTransferReqVO.java | 2 +- .../convert/business/CrmBusinessConvert.java | 19 ++++++--- .../crm/convert/contact/ContactConvert.java | 2 +- .../crm/convert/contract/ContractConvert.java | 2 +- .../dataobject/business/CrmBusinessDO.java | 13 +++--- .../service/business/CrmBusinessService.java | 13 ++++-- .../business/CrmBusinessServiceImpl.java | 41 +++++++++++++++---- .../service/contact/ContactServiceImpl.java | 4 +- 13 files changed, 118 insertions(+), 28 deletions(-) create mode 100644 yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessTransferReqVO.java diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java index f5b5e078b..7c1f351d8 100644 --- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java +++ b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java @@ -19,6 +19,8 @@ public interface ErrorCodeConstants { // ========== 商机管理 1-020-002-000 ========== ErrorCode BUSINESS_NOT_EXISTS = new ErrorCode(1_020_002_000, "商机不存在"); + ErrorCode BUSINESS_TRANSFER_FAIL_PERMISSION_DENIED = new ErrorCode(1_020_002_001, "商机转移失败，原因：没有转移权限"); + ErrorCode BUSINESS_TRANSFER_FAIL_OWNER_USER_NOT_EXISTS = new ErrorCode(1_020_002_002, "商机转移失败，原因：负责人不存在"); // TODO @lilleo：商机状态、商机类型，都单独错误码段 diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java index d517a9f91..8096176c9 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java @@ -23,6 +23,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 商机") @RestController @@ -80,11 +81,19 @@ public class CrmBusinessController { @PreAuthorize("@ss.hasPermission('crm:business:export')") @OperateLog(type = EXPORT) public void exportBusinessExcel(@Valid CrmBusinessExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { List list = businessService.getBusinessList(exportReqVO); // 导出 Excel List datas = CrmBusinessConvert.INSTANCE.convertList02(list); ExcelUtils.write(response, "商机.xls", "数据", CrmBusinessExcelVO.class, datas); } + @PutMapping("/transfer") + @Operation(summary = "商机转移") + @PreAuthorize("@ss.hasPermission('crm:business:update')") + public CommonResult transfer(@Valid @RequestBody CrmBusinessTransferReqVO reqVO) { + businessService.businessTransfer(reqVO, getLoginUserId()); + return success(true); + } + } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessCreateReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessCreateReqVO.java index f743c8469..968a105c8 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessCreateReqVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessCreateReqVO.java @@ -5,12 +5,21 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Set; + @Schema(description = "管理后台 - 商机创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class CrmBusinessCreateReqVO extends CrmBusinessBaseVO { + @Schema(description = "只读权限的用户编号数组") + private Set roUserIds; + + @Schema(description = "读写权限的用户编号数组") + private Set rwUserIds; + + // TODO @ljileo：新建的时候，应该可以传递添加的产品； } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessTransferReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessTransferReqVO.java new file mode 100644 index 000000000..993e4750e --- /dev/null +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessTransferReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.crm.controller.admin.business.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 商机转移 Request VO") +@Data +public class CrmBusinessTransferReqVO { + + @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430") + @NotNull(message = "联系人编号不能为空") + private Long id; + + @Schema(description = "新负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430") + @NotNull(message = "新负责人的用户编号不能为空") + private Long ownerUserId; // 新的负责人 + +} diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessUpdateReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessUpdateReqVO.java index f137d4c5b..2929535cf 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessUpdateReqVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/CrmBusinessUpdateReqVO.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import javax.validation.constraints.NotNull; +import java.util.Set; @Schema(description = "管理后台 - 商机更新 Request VO") @Data @@ -17,6 +18,13 @@ public class CrmBusinessUpdateReqVO extends CrmBusinessBaseVO { @NotNull(message = "主键不能为空") private Long id; + @Schema(description = "只读权限的用户编号数组") + private Set roUserIds; + + @Schema(description = "读写权限的用户编号数组") + private Set rwUserIds; + + // TODO @ljileo：修改的时候，应该可以传递添加的产品； } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java index 517d77576..90acc5645 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; -@Schema(description = "管理后台 - 联系转移 Request VO") +@Schema(description = "管理后台 - 联系人转移 Request VO") @Data public class CrmContactTransferReqVO { diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/business/CrmBusinessConvert.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/business/CrmBusinessConvert.java index 72aad68de..2eabf7d4d 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/business/CrmBusinessConvert.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/business/CrmBusinessConvert.java @@ -1,13 +1,14 @@ package cn.iocoder.yudao.module.crm.convert.business; -import java.util.*; - +import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; import cn.iocoder.yudao.module.crm.controller.admin.business.vo.*; import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; +import java.util.Set; /** * 商机 Convert @@ -29,4 +30,12 @@ public interface CrmBusinessConvert { List convertList02(List list); + default CrmBusinessDO convert(CrmBusinessDO business, CrmBusinessTransferReqVO reqVO, Long userId) { + Set rwUserIds = business.getRwUserIds(); + rwUserIds.removeIf(item -> ObjUtil.equal(item, userId)); // 移除老负责人 + rwUserIds.add(reqVO.getOwnerUserId()); // 读写权限加入新的负人 + return new CrmBusinessDO().setId(business.getId()).setOwnerUserId(reqVO.getOwnerUserId()) // 设置新负责人 + .setRwUserIds(rwUserIds); + } + } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java index 2718b339a..0d1329819 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contact/ContactConvert.java @@ -34,7 +34,7 @@ public interface ContactConvert { default ContactDO convert(ContactDO contact, CrmContactTransferReqVO reqVO, Long userId) { Set rwUserIds = contact.getRwUserIds(); - rwUserIds.removeIf(item -> ObjUtil.equal(item, userId.toString())); // 移除老负责人 + rwUserIds.removeIf(item -> ObjUtil.equal(item, userId)); // 移除老负责人 rwUserIds.add(reqVO.getOwnerUserId()); // 读写权限加入新的负人 return new ContactDO().setId(contact.getId()).setOwnerUserId(reqVO.getOwnerUserId()) // 设置新负责人 .setRwUserIds(rwUserIds); diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contract/ContractConvert.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contract/ContractConvert.java index 023d4200b..d7547d4b8 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contract/ContractConvert.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/contract/ContractConvert.java @@ -34,7 +34,7 @@ public interface ContractConvert { default ContractDO convert(ContractDO contract, CrmContractTransferReqVO reqVO, Long userId) { Set rwUserIds = contract.getRwUserIds(); - rwUserIds.removeIf(item -> ObjUtil.equal(item, userId.toString())); // 移除老负责人 + rwUserIds.removeIf(item -> ObjUtil.equal(item, userId)); // 移除老负责人 rwUserIds.add(reqVO.getOwnerUserId()); // 读写权限加入新的负人 return new ContractDO().setId(contract.getId()).setOwnerUserId(reqVO.getOwnerUserId()) // 设置新负责人 .setRwUserIds(rwUserIds); diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java index 2d6454838..23d7ddb9a 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java @@ -1,14 +1,17 @@ package cn.iocoder.yudao.module.crm.dal.dataobject.business; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; import cn.iocoder.yudao.module.crm.dal.dataobject.businessstatus.CrmBusinessStatusDO; import cn.iocoder.yudao.module.crm.dal.dataobject.businessstatustype.CrmBusinessStatusTypeDO; import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.time.LocalDateTime; +import java.util.Set; /** * 商机 DO @@ -85,16 +88,14 @@ public class CrmBusinessDO extends BaseDO { private Long ownerUserId; /** * 只读权限的用户编号数组 - * - * TODO @lijie：应该是 List，然后使用下对应的 typehandler */ - private String roUserIds; + @TableField(typeHandler = JsonLongSetTypeHandler.class) + private Set roUserIds; /** * 读写权限的用户编号数组 - * - * TODO @lijie：应该是 List，然后使用下对应的 typehandler */ - private String rwUserIds; + @TableField(typeHandler = JsonLongSetTypeHandler.class) + private Set rwUserIds; /** * 1赢单2输单3无效 * diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java index 4bb352c58..8a157440b 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java @@ -1,10 +1,7 @@ package cn.iocoder.yudao.module.crm.service.business; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessCreateReqVO; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessExportReqVO; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessPageReqVO; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessUpdateReqVO; +import cn.iocoder.yudao.module.crm.controller.admin.business.vo.*; import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO; import javax.validation.Valid; @@ -72,4 +69,12 @@ public interface CrmBusinessService { */ List getBusinessList(CrmBusinessExportReqVO exportReqVO); + /** + * 商机转移 + * + * @param reqVO 请求 + * @param userId 用户编号 + */ + void businessTransfer(CrmBusinessTransferReqVO reqVO, Long userId); + } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java index 44fa74f80..4ddb3363e 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java @@ -3,13 +3,12 @@ package cn.iocoder.yudao.module.crm.service.business; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessCreateReqVO; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessExportReqVO; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessPageReqVO; -import cn.iocoder.yudao.module.crm.controller.admin.business.vo.CrmBusinessUpdateReqVO; +import cn.iocoder.yudao.module.crm.controller.admin.business.vo.*; import cn.iocoder.yudao.module.crm.convert.business.CrmBusinessConvert; import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO; import cn.iocoder.yudao.module.crm.dal.mysql.business.CrmBusinessMapper; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -18,7 +17,8 @@ import java.util.Collection; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.BUSINESS_NOT_EXISTS; +import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.crm.framework.utils.AuthUtil.isReadAndWrite; /** * 商机 Service 实现类 @@ -32,6 +32,9 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { @Resource private CrmBusinessMapper businessMapper; + @Resource + private AdminUserApi adminUserApi; + @Override public Long createBusiness(CrmBusinessCreateReqVO createReqVO) { // 插入 @@ -58,10 +61,12 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { businessMapper.deleteById(id); } - private void validateBusinessExists(Long id) { - if (businessMapper.selectById(id) == null) { + private CrmBusinessDO validateBusinessExists(Long id) { + CrmBusinessDO crmBusiness = businessMapper.selectById(id); + if (crmBusiness == null) { throw exception(BUSINESS_NOT_EXISTS); } + return crmBusiness; } @Override @@ -87,4 +92,26 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { return businessMapper.selectList(exportReqVO); } + @Override + public void businessTransfer(CrmBusinessTransferReqVO reqVO, Long userId) { + // 1. 校验商机是否存在 + CrmBusinessDO business = validateBusinessExists(reqVO.getId()); + // 1.2. 校验用户是否拥有读写权限 + if (!isReadAndWrite(business.getRwUserIds(), userId)) { + throw exception(BUSINESS_TRANSFER_FAIL_PERMISSION_DENIED); + } + // 2. 校验新负责人是否存在 + AdminUserRespDTO user = adminUserApi.getUser(reqVO.getOwnerUserId()); + if (user == null) { + throw exception(BUSINESS_TRANSFER_FAIL_OWNER_USER_NOT_EXISTS); + } + + // 3. 更新新的负责人 + CrmBusinessDO updateBusiness = CrmBusinessConvert.INSTANCE.convert(business, reqVO, userId); + businessMapper.updateById(updateBusiness); + + // 4. TODO 记录商机转移日志 + + } + } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java index eb2b97cbe..e47e2e155 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/contact/ContactServiceImpl.java @@ -110,8 +110,8 @@ public class ContactServiceImpl implements ContactService { } // 3. 更新新的负责人 - ContactDO updateContract = ContactConvert.INSTANCE.convert(contact, reqVO, userId); - contactMapper.updateById(updateContract); + ContactDO updateContact = ContactConvert.INSTANCE.convert(contact, reqVO, userId); + contactMapper.updateById(updateContact); // 4. TODO 记录联系人转移日志