childUserTaskList = iteratorFindChildUserTasks((FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements().toArray()[0]), runTaskKeyList, hasSequenceFlow, null);
- // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续
- if (CollUtil.isNotEmpty(childUserTaskList)) {
- userTaskList.addAll(childUserTaskList);
- continue;
- }
- }
- // 继续迭代
- userTaskList = iteratorFindChildUserTasks(sequenceFlow.getTargetFlowElement(), runTaskKeyList, hasSequenceFlow, userTaskList);
- }
- return userTaskList;
- }
-
-}
diff --git a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java b/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java
deleted file mode 100644
index 2a0fc38ac5..0000000000
--- a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core.util;
-
-import org.flowable.common.engine.impl.identity.Authentication;
-
-/**
- * Flowable 相关的工具方法
- *
- * @author 芋道源码
- */
-public class FlowableUtils {
-
- // ========== User 相关的工具方法 ==========
-
- public static void setAuthenticatedUserId(Long userId) {
- Authentication.setAuthenticatedUserId(String.valueOf(userId));
- }
-
- public static void clearAuthenticatedUserId() {
- Authentication.setAuthenticatedUserId(null);
- }
-
- // ========== Execution 相关的工具方法 ==========
-
- public static String formatCollectionVariable(String activityId) {
- return activityId + "_assignees";
- }
-
- public static String formatCollectionElementVariable(String activityId) {
- return activityId + "_assignee";
- }
-
-}
diff --git a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java b/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java
deleted file mode 100644
index d9845a394c..0000000000
--- a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core.web;
-
-import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils;
-import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-/**
- * flowable Web 过滤器，将 userId 设置到 {@link org.flowable.common.engine.impl.identity.Authentication} 中
- *
- * @author jason
- */
-public class FlowableWebFilter extends OncePerRequestFilter {
-
- @Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
- throws ServletException, IOException {
- try {
- // 设置工作流的用户
- Long userId = SecurityFrameworkUtils.getLoginUserId();
- if (userId != null) {
- FlowableUtils.setAuthenticatedUserId(userId);
- }
- // 过滤
- chain.doFilter(request, response);
- } finally {
- // 清理
- FlowableUtils.clearAuthenticatedUserId();
- }
- }
-}
diff --git a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java b/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java
deleted file mode 100644
index 324d3de0ec..0000000000
--- a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.iocoder.yudao.framework.flowable;
diff --git a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 1df61598ce..0000000000
--- a/yudao-module-bpm/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration
\ No newline at end of file
diff --git a/yudao-module-crm/pom.xml b/yudao-module-crm/pom.xml
deleted file mode 100644
index 310a7df872..0000000000
--- a/yudao-module-crm/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- cn.iocoder.boot
- yudao
- ${revision}
-
-
- yudao-module-crm-api
- yudao-module-crm-biz
-
- 4.0.0
- yudao-module-crm
- pom
-
- ${project.artifactId}
-
- crm 包下，客户关系管理（Customer Relationship Management）。
- 例如说：客户、联系人、商机、合同、回款等等
-
-
-
diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/DictTypeConstants.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/DictTypeConstants.java
deleted file mode 100644
index eee2b32d9c..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/DictTypeConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums;
-
-/**
- * CRM 字典类型的枚举类
- *
- * @author 芋道源码
- */
-public interface DictTypeConstants {
-
- String CRM_CUSTOMER_INDUSTRY = "crm_customer_industry"; // CRM 客户所属行业
- String CRM_CUSTOMER_LEVEL = "crm_customer_level"; // CRM 客户等级
- String CRM_CUSTOMER_SOURCE = "crm_customer_source"; // CRM 客户来源
- String CRM_AUDIT_STATUS = "crm_audit_status"; // CRM 审批状态
- String CRM_PRODUCT_UNIT = "crm_product_unit"; // CRM 产品单位
- String CRM_PRODUCT_STATUS = "crm_product_status"; // CRM 产品状态
- String CRM_FOLLOW_UP_TYPE = "crm_follow_up_type"; // CRM 跟进方式
- String CRM_RECEIVABLE_RETURN_TYPE = "crm_receivable_return_type"; // CRM 回款方式
-
-}
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
deleted file mode 100644
index a15a3211b4..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-
-/**
- * CRM 错误码枚举类
- *
- * crm 系统，使用 1-020-000-000 段
- */
-public interface ErrorCodeConstants {
-
- // ========== 合同管理 1-020-000-000 ==========
- ErrorCode CONTRACT_NOT_EXISTS = new ErrorCode(1_020_000_000, "合同不存在");
- ErrorCode CONTRACT_UPDATE_FAIL_NOT_DRAFT = new ErrorCode(1_020_000_001, "合同更新失败，原因：合同不是草稿状态");
- ErrorCode CONTRACT_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_000_002, "合同提交审核失败，原因：合同没处在未提交状态");
- ErrorCode CONTRACT_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_020_000_003, "更新合同审核状态失败，原因：合同不是审核中状态");
- ErrorCode CONTRACT_NO_EXISTS = new ErrorCode(1_020_000_004, "生成合同序列号重复，请重试");
-
- // ========== 线索管理 1-020-001-000 ==========
- ErrorCode CLUE_NOT_EXISTS = new ErrorCode(1_020_001_000, "线索不存在");
- ErrorCode CLUE_TRANSFORM_FAIL_ALREADY = new ErrorCode(1_020_001_001, "线索已经转化过了，请勿重复转化");
-
- // ========== 商机管理 1-020-002-000 ==========
- ErrorCode BUSINESS_NOT_EXISTS = new ErrorCode(1_020_002_000, "商机不存在");
- ErrorCode BUSINESS_DELETE_FAIL_CONTRACT_EXISTS = new ErrorCode(1_020_002_001, "商机已关联合同，不能删除");
- ErrorCode BUSINESS_UPDATE_STATUS_FAIL_END_STATUS = new ErrorCode(1_020_002_002, "更新商机状态失败，原因：已经是结束状态");
- ErrorCode BUSINESS_UPDATE_STATUS_FAIL_STATUS_EQUALS = new ErrorCode(1_020_002_003, "更新商机状态失败，原因：已经是该状态");
-
- // ========== 联系人管理 1-020-003-000 ==========
- ErrorCode CONTACT_NOT_EXISTS = new ErrorCode(1_020_003_000, "联系人不存在");
- ErrorCode CONTACT_DELETE_FAIL_CONTRACT_LINK_EXISTS = new ErrorCode(1_020_003_002, "联系人已关联合同，不能删除");
- ErrorCode CONTACT_UPDATE_OWNER_USER_FAIL = new ErrorCode(1_020_003_003, "更新联系人负责人失败");
-
- // ========== 回款 1-020-004-000 ==========
- ErrorCode RECEIVABLE_NOT_EXISTS = new ErrorCode(1_020_004_000, "回款不存在");
- ErrorCode RECEIVABLE_UPDATE_FAIL_EDITING_PROHIBITED = new ErrorCode(1_020_004_001, "更新回款失败，原因：禁止编辑");
- ErrorCode RECEIVABLE_DELETE_FAIL = new ErrorCode(1_020_004_002, "删除回款失败，原因： 被回款计划所使用，不允许删除");
- ErrorCode RECEIVABLE_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_020_004_003, "回款提交审核失败，原因：回款没处在未提交状态");
- ErrorCode RECEIVABLE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_020_004_004, "更新回款审核状态失败，原因：回款不是审核中状态");
- ErrorCode RECEIVABLE_NO_EXISTS = new ErrorCode(1_020_004_005, "生成回款序列号重复，请重试");
- ErrorCode RECEIVABLE_CREATE_FAIL_CONTRACT_NOT_APPROVE = new ErrorCode(1_020_004_006, "创建回款失败，原因：合同不是审核通过状态");
- ErrorCode RECEIVABLE_CREATE_FAIL_PRICE_EXCEEDS_LIMIT = new ErrorCode(1_020_004_007, "创建回款失败，原因：回款金额超出合同金额，目前剩余可退：{} 元");
-
- // ========== 回款计划 1-020-005-000 ==========
- ErrorCode RECEIVABLE_PLAN_NOT_EXISTS = new ErrorCode(1_020_005_000, "回款计划不存在");
- ErrorCode RECEIVABLE_PLAN_UPDATE_FAIL = new ErrorCode(1_020_006_000, "更想回款计划失败，原因：已经有对应的还款");
- ErrorCode RECEIVABLE_PLAN_EXISTS_RECEIVABLE = new ErrorCode(1_020_006_001, "回款计划已经有对应的回款，不能使用");
-
- // ========== 客户管理 1_020_006_000 ==========
- ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(1_020_006_000, "客户不存在");
- ErrorCode CUSTOMER_OWNER_EXISTS = new ErrorCode(1_020_006_001, "客户【{}】已存在所属负责人");
- ErrorCode CUSTOMER_LOCKED = new ErrorCode(1_020_006_002, "客户【{}】状态已锁定");
- ErrorCode CUSTOMER_ALREADY_DEAL = new ErrorCode(1_020_006_003, "客户已交易");
- ErrorCode CUSTOMER_IN_POOL = new ErrorCode(1_020_006_004, "客户【{}】放入公海失败，原因：已经是公海客户");
- ErrorCode CUSTOMER_LOCKED_PUT_POOL_FAIL = new ErrorCode(1_020_006_005, "客户【{}】放入公海失败，原因：客户已锁定");
- ErrorCode CUSTOMER_UPDATE_OWNER_USER_FAIL = new ErrorCode(1_020_006_006, "更新客户【{}】负责人失败, 原因：系统异常");
- ErrorCode CUSTOMER_LOCK_FAIL_IS_LOCK = new ErrorCode(1_020_006_007, "锁定客户失败，它已经处于锁定状态");
- ErrorCode CUSTOMER_UNLOCK_FAIL_IS_UNLOCK = new ErrorCode(1_020_006_008, "解锁客户失败，它已经处于未锁定状态");
- ErrorCode CUSTOMER_LOCK_EXCEED_LIMIT = new ErrorCode(1_020_006_009, "锁定客户失败，超出锁定规则上限");
- ErrorCode CUSTOMER_OWNER_EXCEED_LIMIT = new ErrorCode(1_020_006_010, "操作失败，超出客户数拥有上限");
- ErrorCode CUSTOMER_DELETE_FAIL_HAVE_REFERENCE = new ErrorCode(1_020_006_011, "删除客户失败，有关联{}");
- ErrorCode CUSTOMER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_020_006_012, "导入客户数据不能为空！");
- ErrorCode CUSTOMER_CREATE_NAME_NOT_NULL = new ErrorCode(1_020_006_013, "客户名称不能为空！");
- ErrorCode CUSTOMER_NAME_EXISTS = new ErrorCode(1_020_006_014, "已存在名为【{}】的客户！");
- ErrorCode CUSTOMER_UPDATE_DEAL_STATUS_FAIL = new ErrorCode(1_020_006_015, "更新客户的成交状态失败，原因：已经是该状态，无需更新");
-
- // ========== 权限管理 1_020_007_000 ==========
- ErrorCode CRM_PERMISSION_NOT_EXISTS = new ErrorCode(1_020_007_000, "数据权限不存在");
- ErrorCode CRM_PERMISSION_DENIED = new ErrorCode(1_020_007_001, "{}操作失败，原因：没有权限");
- ErrorCode CRM_PERMISSION_MODEL_TRANSFER_FAIL_OWNER_USER_EXISTS = new ErrorCode(1_020_007_003, "{}操作失败，原因：转移对象已经是该负责人");
- ErrorCode CRM_PERMISSION_DELETE_FAIL = new ErrorCode(1_020_007_004, "删除数据权限失败，原因：批量删除权限的时候，只能属于同一个 bizId 下");
- ErrorCode CRM_PERMISSION_DELETE_DENIED = new ErrorCode(1_020_007_006, "删除数据权限失败，原因：没有权限");
- ErrorCode CRM_PERMISSION_DELETE_SELF_PERMISSION_FAIL_EXIST_OWNER = new ErrorCode(1_020_007_007, "删除数据权限失败，原因：不能删除负责人");
- ErrorCode CRM_PERMISSION_CREATE_FAIL = new ErrorCode(1_020_007_008, "创建数据权限失败，原因：所加用户已有权限");
-
- // ========== 产品 1_020_008_000 ==========
- ErrorCode PRODUCT_NOT_EXISTS = new ErrorCode(1_020_008_000, "产品不存在");
- ErrorCode PRODUCT_NO_EXISTS = new ErrorCode(1_020_008_001, "产品编号已存在");
- ErrorCode PRODUCT_NOT_ENABLE = new ErrorCode(1_020_008_002, "产品【{}】已禁用");
-
- // ========== 产品分类 1_020_009_000 ==========
- ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_020_009_000, "产品分类不存在");
- ErrorCode PRODUCT_CATEGORY_EXISTS = new ErrorCode(1_020_009_001, "产品分类已存在");
- ErrorCode PRODUCT_CATEGORY_USED = new ErrorCode(1_020_009_002, "产品分类已关联产品");
- ErrorCode PRODUCT_CATEGORY_PARENT_NOT_EXISTS = new ErrorCode(1_020_009_003, "父分类不存在");
- ErrorCode PRODUCT_CATEGORY_PARENT_NOT_FIRST_LEVEL = new ErrorCode(1_020_009_004, "父分类不能是二级分类");
- ErrorCode product_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_020_009_005, "存在子分类，无法删除");
-
- // ========== 商机状态 1_020_010_000 ==========
- ErrorCode BUSINESS_STATUS_TYPE_NOT_EXISTS = new ErrorCode(1_020_010_000, "商机状态组不存在");
- ErrorCode BUSINESS_STATUS_TYPE_NAME_EXISTS = new ErrorCode(1_020_010_001, "商机状态组的名称已存在");
- ErrorCode BUSINESS_STATUS_UPDATE_FAIL_USED = new ErrorCode(1_020_010_002, "已经被使用的商机状态组，无法进行更新");
- ErrorCode BUSINESS_STATUS_DELETE_FAIL_USED = new ErrorCode(1_020_010_002, "已经被使用的商机状态组，无法进行删除");
- ErrorCode BUSINESS_STATUS_NOT_EXISTS = new ErrorCode(1_020_010_003, "商机状态不存在");
-
- // ========== 客户公海规则设置 1_020_012_000 ==========
- ErrorCode CUSTOMER_LIMIT_CONFIG_NOT_EXISTS = new ErrorCode(1_020_012_001, "客户限制配置不存在");
-
- // ========== 跟进记录 1_020_013_000 ==========
- ErrorCode FOLLOW_UP_RECORD_NOT_EXISTS = new ErrorCode(1_020_013_000, "跟进记录不存在");
- ErrorCode FOLLOW_UP_RECORD_DELETE_DENIED = new ErrorCode(1_020_013_001, "删除跟进记录失败，原因：没有权限");
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/LogRecordConstants.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/LogRecordConstants.java
deleted file mode 100644
index c2c835b7f1..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/LogRecordConstants.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums;
-
-/**
- * CRM 操作日志枚举
- * 目的：统一管理，也减少 Service 里各种“复杂”字符串
- *
- * @author HUIHUI
- */
-public interface LogRecordConstants {
-
- // ======================= CRM_CLUE 线索 =======================
-
- String CRM_CLUE_TYPE = "CRM 线索";
- String CRM_CLUE_CREATE_SUB_TYPE = "创建线索";
- String CRM_CLUE_CREATE_SUCCESS = "创建了线索{{#clue.name}}";
- String CRM_CLUE_UPDATE_SUB_TYPE = "更新线索";
- String CRM_CLUE_UPDATE_SUCCESS = "更新了线索【{{#clueName}}】: {_DIFF{#updateReq}}";
- String CRM_CLUE_DELETE_SUB_TYPE = "删除线索";
- String CRM_CLUE_DELETE_SUCCESS = "删除了线索【{{#clueName}}】";
- String CRM_CLUE_TRANSFER_SUB_TYPE = "转移线索";
- String CRM_CLUE_TRANSFER_SUCCESS = "将线索【{{#clue.name}}】的负责人从【{getAdminUserById{#clue.ownerUserId}}】变更为了【{getAdminUserById{#reqVO.newOwnerUserId}}】";
- String CRM_CLUE_TRANSLATE_SUB_TYPE = "线索转化为客户";
- String CRM_CLUE_TRANSLATE_SUCCESS = "将线索【{{#clueName}}】转化为客户";
- String CRM_CLUE_FOLLOW_UP_SUB_TYPE = "线索跟进";
- String CRM_CLUE_FOLLOW_UP_SUCCESS = "线索跟进【{{#clueName}}】";
-
- // ======================= CRM_CUSTOMER 客户 =======================
-
- String CRM_CUSTOMER_TYPE = "CRM 客户";
- String CRM_CUSTOMER_CREATE_SUB_TYPE = "创建客户";
- String CRM_CUSTOMER_CREATE_SUCCESS = "创建了客户{{#customer.name}}";
- String CRM_CUSTOMER_UPDATE_SUB_TYPE = "更新客户";
- String CRM_CUSTOMER_UPDATE_SUCCESS = "更新了客户【{{#customerName}}】: {_DIFF{#updateReqVO}}";
- String CRM_CUSTOMER_DELETE_SUB_TYPE = "删除客户";
- String CRM_CUSTOMER_DELETE_SUCCESS = "删除了客户【{{#customerName}}】";
- String CRM_CUSTOMER_TRANSFER_SUB_TYPE = "转移客户";
- String CRM_CUSTOMER_TRANSFER_SUCCESS = "将客户【{{#customer.name}}】的负责人从【{getAdminUserById{#customer.ownerUserId}}】变更为了【{getAdminUserById{#reqVO.newOwnerUserId}}】";
- String CRM_CUSTOMER_LOCK_SUB_TYPE = "{{#customer.lockStatus ? '解锁客户' : '锁定客户'}}";
- String CRM_CUSTOMER_LOCK_SUCCESS = "{{#customer.lockStatus ? '将客户【' + #customer.name + '】解锁' : '将客户【' + #customer.name + '】锁定'}}";
- String CRM_CUSTOMER_POOL_SUB_TYPE = "客户放入公海";
- String CRM_CUSTOMER_POOL_SUCCESS = "将客户【{{#customerName}}】放入了公海";
- String CRM_CUSTOMER_RECEIVE_SUB_TYPE = "{{#ownerUserName != null ? '分配客户' : '领取客户'}}";
- String CRM_CUSTOMER_RECEIVE_SUCCESS = "{{#ownerUserName != null ? '将客户【' + #customer.name + '】分配给【' + #ownerUserName + '】' : '领取客户【' + #customer.name + '】'}}";
- String CRM_CUSTOMER_IMPORT_SUB_TYPE = "{{#isUpdate ? '导入并更新客户' : '导入客户'}}";
- String CRM_CUSTOMER_IMPORT_SUCCESS = "{{#isUpdate ? '导入并更新了客户【'+ #customer.name +'】' : '导入了客户【'+ #customer.name +'】'}}";
- String CRM_CUSTOMER_UPDATE_DEAL_STATUS_SUB_TYPE = "更新客户成交状态";
- String CRM_CUSTOMER_UPDATE_DEAL_STATUS_SUCCESS = "更新了客户【{{#customerName}}】的成交状态为【{{#dealStatus ? '已成交' : '未成交'}}】";
- String CRM_CUSTOMER_FOLLOW_UP_SUB_TYPE = "客户跟进";
- String CRM_CUSTOMER_FOLLOW_UP_SUCCESS = "客户跟进【{{#customerName}}】";
-
- // ======================= CRM_CUSTOMER_LIMIT_CONFIG 客户限制配置 =======================
-
- String CRM_CUSTOMER_LIMIT_CONFIG_TYPE = "CRM 客户限制配置";
- String CRM_CUSTOMER_LIMIT_CONFIG_CREATE_SUB_TYPE = "创建客户限制配置";
- String CRM_CUSTOMER_LIMIT_CONFIG_CREATE_SUCCESS = "创建了【{{#limitType}}】类型的客户限制配置";
- String CRM_CUSTOMER_LIMIT_CONFIG_UPDATE_SUB_TYPE = "更新客户限制配置";
- String CRM_CUSTOMER_LIMIT_CONFIG_UPDATE_SUCCESS = "更新了客户限制配置: {_DIFF{#updateReqVO}}";
- String CRM_CUSTOMER_LIMIT_CONFIG_DELETE_SUB_TYPE = "删除客户限制配置";
- String CRM_CUSTOMER_LIMIT_CONFIG_DELETE_SUCCESS = "删除了【{{#limitType}}】类型的客户限制配置";
-
- // ======================= CRM_CUSTOMER_POOL_CONFIG 客户公海规则 =======================
-
- String CRM_CUSTOMER_POOL_CONFIG_TYPE = "CRM 客户公海规则";
- String CRM_CUSTOMER_POOL_CONFIG_SUB_TYPE = "{{#isPoolConfigUpdate ? '更新客户公海规则' : '创建客户公海规则'}}";
- String CRM_CUSTOMER_POOL_CONFIG_SUCCESS = "{{#isPoolConfigUpdate ? '更新了客户公海规则' : '创建了客户公海规则'}}";
-
- // ======================= CRM_CONTACT 联系人 =======================
-
- String CRM_CONTACT_TYPE = "CRM 联系人";
- String CRM_CONTACT_CREATE_SUB_TYPE = "创建联系人";
- String CRM_CONTACT_CREATE_SUCCESS = "创建了联系人{{#contact.name}}";
- String CRM_CONTACT_UPDATE_SUB_TYPE = "更新联系人";
- String CRM_CONTACT_UPDATE_SUCCESS = "更新了联系人【{{#contactName}}】: {_DIFF{#updateReqVO}}";
- String CRM_CONTACT_DELETE_SUB_TYPE = "删除联系人";
- String CRM_CONTACT_DELETE_SUCCESS = "删除了联系人【{{#contactName}}】";
- String CRM_CONTACT_TRANSFER_SUB_TYPE = "转移联系人";
- String CRM_CONTACT_TRANSFER_SUCCESS = "将联系人【{{#contact.name}}】的负责人从【{getAdminUserById{#contact.ownerUserId}}】变更为了【{getAdminUserById{#reqVO.newOwnerUserId}}】";
- String CRM_CONTACT_FOLLOW_UP_SUB_TYPE = "联系人跟进";
- String CRM_CONTACT_FOLLOW_UP_SUCCESS = "联系人跟进【{{#contactName}}】";
- String CRM_CONTACT_UPDATE_OWNER_USER_SUB_TYPE = "更新联系人负责人";
- String CRM_CONTACT_UPDATE_OWNER_USER_SUCCESS = "将联系人【{{#contact.name}}】的负责人从【{getAdminUserById{#contact.ownerUserId}}】变更为了【{getAdminUserById{#ownerUserId}}】";
-
- // ======================= CRM_BUSINESS 商机 =======================
-
- String CRM_BUSINESS_TYPE = "CRM 商机";
- String CRM_BUSINESS_CREATE_SUB_TYPE = "创建商机";
- String CRM_BUSINESS_CREATE_SUCCESS = "创建了商机{{#business.name}}";
- String CRM_BUSINESS_UPDATE_SUB_TYPE = "更新商机";
- String CRM_BUSINESS_UPDATE_SUCCESS = "更新了商机【{{#businessName}}】: {_DIFF{#updateReqVO}}";
- String CRM_BUSINESS_DELETE_SUB_TYPE = "删除商机";
- String CRM_BUSINESS_DELETE_SUCCESS = "删除了商机【{{#businessName}}】";
- String CRM_BUSINESS_TRANSFER_SUB_TYPE = "转移商机";
- String CRM_BUSINESS_TRANSFER_SUCCESS = "将商机【{{#business.name}}】的负责人从【{getAdminUserById{#business.ownerUserId}}】变更为了【{getAdminUserById{#reqVO.newOwnerUserId}}】";
- String CRM_BUSINESS_FOLLOW_UP_SUB_TYPE = "商机跟进";
- String CRM_BUSINESS_FOLLOW_UP_SUCCESS = "商机跟进【{{#businessName}}】";
- String CRM_BUSINESS_UPDATE_STATUS_SUB_TYPE = "更新商机状态";
- String CRM_BUSINESS_UPDATE_STATUS_SUCCESS = "更新了商机【{{#businessName}}】的状态从【{{#oldStatusName}}】变更为了【{{#newStatusName}}】";
-
- // ======================= CRM_CONTRACT_CONFIG 合同配置 =======================
-
- String CRM_CONTRACT_CONFIG_TYPE = "CRM 合同配置";
- String CRM_CONTRACT_CONFIG_SUB_TYPE = "{{#isPoolConfigUpdate ? '更新合同配置' : '创建合同配置'}}";
- String CRM_CONTRACT_CONFIG_SUCCESS = "{{#isPoolConfigUpdate ? '更新了合同配置' : '创建了合同配置'}}";
-
- // ======================= CRM_CONTRACT 合同 =======================
-
- String CRM_CONTRACT_TYPE = "CRM 合同";
- String CRM_CONTRACT_CREATE_SUB_TYPE = "创建合同";
- String CRM_CONTRACT_CREATE_SUCCESS = "创建了合同{{#contract.name}}";
- String CRM_CONTRACT_UPDATE_SUB_TYPE = "更新合同";
- String CRM_CONTRACT_UPDATE_SUCCESS = "更新了合同【{{#contractName}}】: {_DIFF{#updateReqVO}}";
- String CRM_CONTRACT_DELETE_SUB_TYPE = "删除合同";
- String CRM_CONTRACT_DELETE_SUCCESS = "删除了合同【{{#contractName}}】";
- String CRM_CONTRACT_TRANSFER_SUB_TYPE = "转移合同";
- String CRM_CONTRACT_TRANSFER_SUCCESS = "将合同【{{#contract.name}}】的负责人从【{getAdminUserById{#contract.ownerUserId}}】变更为了【{getAdminUserById{#reqVO.newOwnerUserId}}】";
- String CRM_CONTRACT_SUBMIT_SUB_TYPE = "提交合同审批";
- String CRM_CONTRACT_SUBMIT_SUCCESS = "提交合同【{{#contractName}}】审批成功";
- String CRM_CONTRACT_FOLLOW_UP_SUB_TYPE = "合同跟进";
- String CRM_CONTRACT_FOLLOW_UP_SUCCESS = "合同跟进【{{#contractName}}】";
-
- // ======================= CRM_PRODUCT 产品 =======================
-
- String CRM_PRODUCT_TYPE = "CRM 产品";
- String CRM_PRODUCT_CREATE_SUB_TYPE = "创建产品";
- String CRM_PRODUCT_CREATE_SUCCESS = "创建了产品【{{#createReqVO.name}}】";
- String CRM_PRODUCT_UPDATE_SUB_TYPE = "更新产品";
- String CRM_PRODUCT_UPDATE_SUCCESS = "更新了产品【{{#updateReqVO.name}}】: {_DIFF{#updateReqVO}}";
- String CRM_PRODUCT_DELETE_SUB_TYPE = "删除产品";
- String CRM_PRODUCT_DELETE_SUCCESS = "删除了产品【{{#product.name}}】";
-
- // ======================= CRM_PRODUCT_CATEGORY 产品分类 =======================
-
- String CRM_PRODUCT_CATEGORY_TYPE = "CRM 产品分类";
- String CRM_PRODUCT_CATEGORY_CREATE_SUB_TYPE = "创建产品分类";
- String CRM_PRODUCT_CATEGORY_CREATE_SUCCESS = "创建了产品分类【{{#createReqVO.name}}】";
- String CRM_PRODUCT_CATEGORY_UPDATE_SUB_TYPE = "更新产品分类";
- String CRM_PRODUCT_CATEGORY_UPDATE_SUCCESS = "更新了产品分类【{{#updateReqVO.name}}】: {_DIFF{#updateReqVO}}";
- String CRM_PRODUCT_CATEGORY_DELETE_SUB_TYPE = "删除产品分类";
- String CRM_PRODUCT_CATEGORY_DELETE_SUCCESS = "删除了产品分类【{{#productCategory.name}}】";
-
- // ======================= CRM_RECEIVABLE 回款 =======================
-
- String CRM_RECEIVABLE_TYPE = "CRM 回款";
- String CRM_RECEIVABLE_CREATE_SUB_TYPE = "创建回款";
- String CRM_RECEIVABLE_CREATE_SUCCESS = "创建了合同【{getContractById{#receivable.contractId}}】的第【{{#receivable.period}}】期回款";
- String CRM_RECEIVABLE_UPDATE_SUB_TYPE = "更新回款";
- String CRM_RECEIVABLE_UPDATE_SUCCESS = "更新了合同【{getContractById{#receivable.contractId}}】的第【{{#receivable.period}}】期回款: {_DIFF{#updateReqVO}}";
- String CRM_RECEIVABLE_DELETE_SUB_TYPE = "删除回款";
- String CRM_RECEIVABLE_DELETE_SUCCESS = "删除了合同【{getContractById{#receivable.contractId}}】的第【{{#receivable.period}}】期回款";
- String CRM_RECEIVABLE_SUBMIT_SUB_TYPE = "提交回款审批";
- String CRM_RECEIVABLE_SUBMIT_SUCCESS = "提交编号为【{{#receivableNo}}】的回款审批成功";
-
- // ======================= CRM_RECEIVABLE_PLAN 回款计划 =======================
-
- String CRM_RECEIVABLE_PLAN_TYPE = "CRM 回款计划";
- String CRM_RECEIVABLE_PLAN_CREATE_SUB_TYPE = "创建回款计划";
- String CRM_RECEIVABLE_PLAN_CREATE_SUCCESS = "创建了合同【{getContractById{#receivablePlan.contractId}}】的第【{{#receivablePlan.period}}】期回款计划";
- String CRM_RECEIVABLE_PLAN_UPDATE_SUB_TYPE = "更新回款计划";
- String CRM_RECEIVABLE_PLAN_UPDATE_SUCCESS = "更新了合同【{getContractById{#receivablePlan.contractId}}】的第【{{#receivablePlan.period}}】期回款计划: {_DIFF{#updateReqVO}}";
- String CRM_RECEIVABLE_PLAN_DELETE_SUB_TYPE = "删除回款计划";
- String CRM_RECEIVABLE_PLAN_DELETE_SUCCESS = "删除了合同【{getContractById{#receivablePlan.contractId}}】的第【{{#receivablePlan.period}}】期回款计划";
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBusinessEndStatusEnum.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBusinessEndStatusEnum.java
deleted file mode 100644
index 4736c01b77..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBusinessEndStatusEnum.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums.business;
-
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Arrays;
-
-/**
- * 商机的结束状态枚举
- *
- * @author lzxhqs
- */
-@RequiredArgsConstructor
-@Getter
-public enum CrmBusinessEndStatusEnum implements IntArrayValuable {
-
- WIN(1, "赢单"),
- LOSE(2, "输单"),
- INVALID(3, "无效");
-
- public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmBusinessEndStatusEnum::getStatus).toArray();
-
- /**
- * 场景类型
- */
- private final Integer status;
- /**
- * 场景名称
- */
- private final String name;
-
- @Override
- public int[] array() {
- return ARRAYS;
- }
-
- public static CrmBusinessEndStatusEnum fromStatus(Integer status) {
- return Arrays.stream(values())
- .filter(value -> value.getStatus().equals(status))
- .findFirst()
- .orElse(null);
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/common/CrmBizTypeEnum.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/common/CrmBizTypeEnum.java
deleted file mode 100644
index 8402ad2886..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/common/CrmBizTypeEnum.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums.common;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjUtil;
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.Arrays;
-
-/**
- * CRM 业务类型枚举
- *
- * @author HUIHUI
- */
-@RequiredArgsConstructor
-@Getter
-public enum CrmBizTypeEnum implements IntArrayValuable {
-
- CRM_CLUE(1, "线索"),
- CRM_CUSTOMER(2, "客户"),
- CRM_CONTACT(3, "联系人"),
- CRM_BUSINESS(4, "商机"),
- CRM_CONTRACT(5, "合同"),
- CRM_PRODUCT(6, "产品"),
- CRM_RECEIVABLE(7, "回款"),
- CRM_RECEIVABLE_PLAN(8, "回款计划")
- ;
-
- public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmBizTypeEnum::getType).toArray();
-
- /**
- * 类型
- */
- private final Integer type;
- /**
- * 名称
- */
- private final String name;
-
- public static String getNameByType(Integer type) {
- CrmBizTypeEnum typeEnum = CollUtil.findOne(CollUtil.newArrayList(CrmBizTypeEnum.values()),
- item -> ObjUtil.equal(item.type, type));
- return typeEnum == null ? null : typeEnum.getName();
- }
-
- @Override
- public int[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/permission/CrmPermissionLevelEnum.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/permission/CrmPermissionLevelEnum.java
deleted file mode 100644
index 7b44fe962e..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/permission/CrmPermissionLevelEnum.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums.permission;
-
-import cn.hutool.core.util.ObjUtil;
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * CRM 数据权限级别枚举
- *
- * OWNER > WRITE > READ
- *
- * @author HUIHUI
- */
-@Getter
-@AllArgsConstructor
-public enum CrmPermissionLevelEnum implements IntArrayValuable {
-
- OWNER(1, "负责人"),
- READ(2, "只读"),
- WRITE(3, "读写");
-
- public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmPermissionLevelEnum::getLevel).toArray();
-
- /**
- * 级别
- */
- private final Integer level;
- /**
- * 级别名称
- */
- private final String name;
-
- @Override
- public int[] array() {
- return ARRAYS;
- }
-
- public static boolean isOwner(Integer level) {
- return ObjUtil.equal(OWNER.level, level);
- }
-
- public static boolean isRead(Integer level) {
- return ObjUtil.equal(READ.level, level);
- }
-
- public static boolean isWrite(Integer level) {
- return ObjUtil.equal(WRITE.level, level);
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/receivable/CrmReceivableReturnTypeEnum.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/receivable/CrmReceivableReturnTypeEnum.java
deleted file mode 100644
index 3c01fe95c1..0000000000
--- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/receivable/CrmReceivableReturnTypeEnum.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.crm.enums.receivable;
-
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * CRM 回款方式枚举
- *
- * @author HUIHUI
- */
-@Getter
-@AllArgsConstructor
-public enum CrmReceivableReturnTypeEnum implements IntArrayValuable {
-
- CHECK(1, "支票"),
- CASH(2, "现金"),
- POSTAL_REMITTANCE(3, "邮政汇款"),
- TELEGRAPHIC_TRANSFER(4, "电汇"),
- ONLINE_TRANSFER(5, "网上转账"),
- ALIPAY(6, "支付宝"),
- WECHAT_PAY(7, "微信支付"),
- OTHER(8, "其它");
-
- public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmReceivableReturnTypeEnum::getType).toArray();
-
- /**
- * 类型
- */
- private final Integer type;
- /**
- * 名称
- */
- private final String name;
-
- @Override
- public int[] array() {
- return ARRAYS;
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/pom.xml b/yudao-module-crm/yudao-module-crm-biz/pom.xml
deleted file mode 100644
index 04e048da79..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
- cn.iocoder.boot
- yudao-module-crm
- ${revision}
-
- 4.0.0
- yudao-module-crm-biz
-
- ${project.artifactId}
-
- crm 包下，客户关系管理（Customer Relationship Management）。
- 例如说：客户、联系人、商机、合同、回款等等
-
-
-
-
- cn.iocoder.boot
- yudao-module-system-api
- ${revision}
-
-
- cn.iocoder.boot
- yudao-module-crm-api
- ${revision}
-
-
- cn.iocoder.boot
- yudao-module-bpm-api
- ${revision}
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-operatelog
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-ip
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-tenant
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-web
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-security
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-mybatis
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-excel
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-test
-
-
-
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
deleted file mode 100644
index 8cd44bd8cb..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.*;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessProductDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessStatusDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessStatusTypeDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductDO;
-import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
-import cn.iocoder.yudao.module.crm.service.business.CrmBusinessStatusService;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
-import cn.iocoder.yudao.module.crm.service.product.CrmProductService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.CUSTOMER_NOT_EXISTS;
-
-@Tag(name = "管理后台 - CRM 商机")
-@RestController
-@RequestMapping("/crm/business")
-@Validated
-public class CrmBusinessController {
-
- @Resource
- private CrmBusinessService businessService;
- @Resource
- private CrmCustomerService customerService;
- @Resource
- private CrmBusinessStatusService businessStatusTypeService;
- @Resource
- private CrmBusinessStatusService businessStatusService;
- @Resource
- private CrmProductService productService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建商机")
- @PreAuthorize("@ss.hasPermission('crm:business:create')")
- public CommonResult createBusiness(@Valid @RequestBody CrmBusinessSaveReqVO createReqVO) {
- return success(businessService.createBusiness(createReqVO, getLoginUserId()));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新商机")
- @PreAuthorize("@ss.hasPermission('crm:business:update')")
- public CommonResult updateBusiness(@Valid @RequestBody CrmBusinessSaveReqVO updateReqVO) {
- businessService.updateBusiness(updateReqVO);
- return success(true);
- }
-
- @PutMapping("/update-status")
- @Operation(summary = "更新商机状态")
- @PreAuthorize("@ss.hasPermission('crm:business:update')")
- public CommonResult updateBusinessStatus(@Valid @RequestBody CrmBusinessUpdateStatusReqVO updateStatusReqVO) {
- businessService.updateBusinessStatus(updateStatusReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除商机")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:business:delete')")
- public CommonResult deleteBusiness(@RequestParam("id") Long id) {
- businessService.deleteBusiness(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得商机")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
- public CommonResult getBusiness(@RequestParam("id") Long id) {
- CrmBusinessDO business = businessService.getBusiness(id);
- return success(buildBusinessDetail(business));
- }
-
- private CrmBusinessRespVO buildBusinessDetail(CrmBusinessDO business) {
- if (business == null) {
- return null;
- }
- CrmBusinessRespVO businessVO = buildBusinessDetailList(Collections.singletonList(business)).get(0);
- // 拼接产品项
- List businessProducts = businessService.getBusinessProductListByBusinessId(businessVO.getId());
- Map productMap = productService.getProductMap(
- convertSet(businessProducts, CrmBusinessProductDO::getProductId));
- businessVO.setProducts(BeanUtils.toBean(businessProducts, CrmBusinessRespVO.Product.class, businessProductVO ->
- MapUtils.findAndThen(productMap, businessProductVO.getProductId(),
- product -> businessProductVO.setProductName(product.getName())
- .setProductNo(product.getNo()).setProductUnit(product.getUnit()))));
- return businessVO;
- }
-
- @GetMapping("/simple-all-list")
- @Operation(summary = "获得联系人的精简列表")
- @PreAuthorize("@ss.hasPermission('crm:contact:query')")
- public CommonResult> getSimpleContactList() {
- CrmBusinessPageReqVO reqVO = new CrmBusinessPageReqVO();
- reqVO.setPageSize(PAGE_SIZE_NONE); // 不分页
- PageResult pageResult = businessService.getBusinessPage(reqVO, getLoginUserId());
- return success(convertList(pageResult.getList(), business -> // 只返回 id、name 字段
- new CrmBusinessRespVO().setId(business.getId()).setName(business.getName())
- .setCustomerId(business.getCustomerId())));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得商机分页")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
- public CommonResult> getBusinessPage(@Valid CrmBusinessPageReqVO pageVO) {
- PageResult pageResult = businessService.getBusinessPage(pageVO, getLoginUserId());
- return success(new PageResult<>(buildBusinessDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/page-by-customer")
- @Operation(summary = "获得商机分页，基于指定客户")
- public CommonResult> getBusinessPageByCustomer(@Valid CrmBusinessPageReqVO pageReqVO) {
- if (pageReqVO.getCustomerId() == null) {
- throw exception(CUSTOMER_NOT_EXISTS);
- }
- PageResult pageResult = businessService.getBusinessPageByCustomerId(pageReqVO);
- return success(new PageResult<>(buildBusinessDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/page-by-contact")
- @Operation(summary = "获得联系人的商机分页")
- @PreAuthorize("@ss.hasPermission('crm:business:query')")
- public CommonResult> getBusinessContactPage(@Valid CrmBusinessPageReqVO pageReqVO) {
- PageResult pageResult = businessService.getBusinessPageByContact(pageReqVO);
- return success(new PageResult<>(buildBusinessDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "导出商机 Excel")
- @PreAuthorize("@ss.hasPermission('crm:business:export')")
- @OperateLog(type = EXPORT)
- public void exportBusinessExcel(@Valid CrmBusinessPageReqVO exportReqVO,
- HttpServletResponse response) throws IOException {
- exportReqVO.setPageSize(PAGE_SIZE_NONE);
- List list = businessService.getBusinessPage(exportReqVO, getLoginUserId()).getList();
- // 导出 Excel
- ExcelUtils.write(response, "商机.xls", "数据", CrmBusinessRespVO.class,
- buildBusinessDetailList(list));
- }
-
- private List buildBusinessDetailList(List list) {
- if (CollUtil.isEmpty(list)) {
- return Collections.emptyList();
- }
- // 1.1 获取客户列表
- Map customerMap = customerService.getCustomerMap(
- convertSet(list, CrmBusinessDO::getCustomerId));
- // 1.2 获取创建人、负责人列表
- Map userMap = adminUserApi.getUserMap(convertListByFlatMap(list,
- contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getOwnerUserId())));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
- // 1.3 获得商机状态组
- Map statusTypeMap = businessStatusTypeService.getBusinessStatusTypeMap(
- convertSet(list, CrmBusinessDO::getStatusTypeId));
- Map statusMap = businessStatusService.getBusinessStatusMap(
- convertSet(list, CrmBusinessDO::getStatusId));
- // 2. 拼接数据
- return BeanUtils.toBean(list, CrmBusinessRespVO.class, businessVO -> {
- // 2.1 设置客户名称
- MapUtils.findAndThen(customerMap, businessVO.getCustomerId(), customer -> businessVO.setCustomerName(customer.getName()));
- // 2.2 设置创建人、负责人名称
- MapUtils.findAndThen(userMap, NumberUtils.parseLong(businessVO.getCreator()),
- user -> businessVO.setCreatorName(user.getNickname()));
- MapUtils.findAndThen(userMap, businessVO.getOwnerUserId(), user -> {
- businessVO.setOwnerUserName(user.getNickname());
- MapUtils.findAndThen(deptMap, user.getDeptId(), dept -> businessVO.setOwnerUserDeptName(dept.getName()));
- });
- // 2.3 设置商机状态
- MapUtils.findAndThen(statusTypeMap, businessVO.getStatusTypeId(), statusType -> businessVO.setStatusTypeName(statusType.getName()));
- MapUtils.findAndThen(statusMap, businessVO.getStatusId(), status -> businessVO.setStatusName(
- businessService.getBusinessStatusName(businessVO.getEndStatus(), status)));
- });
- }
-
- @PutMapping("/transfer")
- @Operation(summary = "商机转移")
- @PreAuthorize("@ss.hasPermission('crm:business:update')")
- public CommonResult transferBusiness(@Valid @RequestBody CrmBusinessTransferReqVO reqVO) {
- businessService.transferBusiness(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/CrmBusinessStatusController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java
deleted file mode 100644
index db80306730..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.crm.controller.admin.business.vo.status.CrmBusinessStatusRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.business.vo.status.CrmBusinessStatusSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessStatusDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessStatusTypeDO;
-import cn.iocoder.yudao.module.crm.service.business.CrmBusinessStatusService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - CRM 商机状态")
-@RestController
-@RequestMapping("/crm/business-status")
-@Validated
-public class CrmBusinessStatusController {
-
- @Resource
- private CrmBusinessStatusService businessStatusTypeService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建商机状态")
- @PreAuthorize("@ss.hasPermission('crm:business-status:create')")
- public CommonResult createBusinessStatus(@Valid @RequestBody CrmBusinessStatusSaveReqVO createReqVO) {
- return success(businessStatusTypeService.createBusinessStatus(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新商机状态")
- @PreAuthorize("@ss.hasPermission('crm:business-status:update')")
- public CommonResult updateBusinessStatus(@Valid @RequestBody CrmBusinessStatusSaveReqVO updateReqVO) {
- businessStatusTypeService.updateBusinessStatus(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除商机状态")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:business-status:delete')")
- public CommonResult deleteBusinessStatusType(@RequestParam("id") Long id) {
- businessStatusTypeService.deleteBusinessStatusType(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得商机状态")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:business-status:query')")
- public CommonResult getBusinessStatusType(@RequestParam("id") Long id) {
- CrmBusinessStatusTypeDO statusType = businessStatusTypeService.getBusinessStatusType(id);
- if (statusType == null) {
- return success(null);
- }
- List statuses = businessStatusTypeService.getBusinessStatusListByTypeId(id);
- return success(BeanUtils.toBean(statusType, CrmBusinessStatusRespVO.class,
- statusTypeVO -> statusTypeVO.setStatuses(BeanUtils.toBean(statuses, CrmBusinessStatusRespVO.Status.class))));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得商机状态分页")
- @PreAuthorize("@ss.hasPermission('crm:business-status:query')")
- public CommonResult> getBusinessStatusPage(@Valid PageParam pageReqVO) {
- // 1. 查询数据
- PageResult pageResult = businessStatusTypeService.getBusinessStatusTypePage(pageReqVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(PageResult.empty(pageResult.getTotal()));
- }
- // 2. 拼接数据
- Map userMap = adminUserApi.getUserMap(
- convertSet(pageResult.getList(), statusType -> Long.parseLong(statusType.getCreator())));
- Map deptMap = deptApi.getDeptMap(
- convertSetByFlatMap(pageResult.getList(), CrmBusinessStatusTypeDO::getDeptIds, Collection::stream));
- return success(BeanUtils.toBean(pageResult, CrmBusinessStatusRespVO.class, statusTypeVO -> {
- statusTypeVO.setCreator(userMap.get(NumberUtils.parseLong(statusTypeVO.getCreator())).getNickname());
- statusTypeVO.setDeptNames(convertList(statusTypeVO.getDeptIds(),
- deptId -> deptMap.containsKey(deptId) ? deptMap.get(deptId).getName() : null));
- }));
- }
-
- @GetMapping("/type-simple-list")
- @Operation(summary = "获得商机状态组列表")
- public CommonResult> getBusinessStatusTypeSimpleList() {
- List list = businessStatusTypeService.getBusinessStatusTypeList();
- // 过滤掉部门不匹配的
- Long deptId = adminUserApi.getUser(getLoginUserId()).getDeptId();
- list.removeIf(statusType -> CollUtil.isNotEmpty(statusType.getDeptIds()) && !statusType.getDeptIds().contains(deptId));
- return success(BeanUtils.toBean(list, CrmBusinessStatusRespVO.class));
- }
-
- @GetMapping("/status-simple-list")
- @Operation(summary = "获得商机状态列表")
- @Parameter(name = "typeId", description = "商机状态组", required = true, example = "1024")
- public CommonResult> getBusinessStatusSimpleList(@RequestParam("typeId") Long typeId) {
- List list = businessStatusTypeService.getBusinessStatusListByTypeId(typeId);
- return success(BeanUtils.toBean(list, CrmBusinessStatusRespVO.Status.class));
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
deleted file mode 100644
index 49cdcb80be..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessRespVO.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business.vo.business;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管理后台 - CRM 商机 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CrmBusinessRespVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32129")
- @ExcelProperty("编号")
- private Long id;
-
- @Schema(description = "商机名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- @ExcelProperty("商机名称")
- private String name;
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10299")
- private Long customerId;
- @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- @ExcelProperty("客户名称")
- private String customerName;
-
- @Schema(description = "跟进状态", requiredMode = Schema.RequiredMode.REQUIRED, example ="true")
- @ExcelProperty("跟进状态")
- private Boolean followUpStatus;
-
- @Schema(description = "最后跟进时间")
- @ExcelProperty("最后跟进时间")
- private LocalDateTime contactLastTime;
-
- @Schema(description = "下次联系时间")
- @ExcelProperty("下次联系时间")
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人的用户编号", example = "25682")
- @ExcelProperty("负责人的用户编号")
- private Long ownerUserId;
- @Schema(description = "负责人名字", example = "25682")
- @ExcelProperty("负责人名字")
- private String ownerUserName;
- @Schema(description = "负责人部门")
- @ExcelProperty("负责人部门")
- private String ownerUserDeptName;
-
- @Schema(description = "商机状态组编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25714")
- private Long statusTypeId;
- @Schema(description = "商机状组名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "进行中")
- @ExcelProperty("商机状态组")
- private String statusTypeName;
-
- @Schema(description = "商机状态编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320")
- private Long statusId;
- @Schema(description = "状态名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "跟进中")
- @ExcelProperty("商机状态")
- private String statusName;
-
- @Schema
- @ExcelProperty("结束状态")
- private Integer endStatus;
-
- @ExcelProperty("结束时的备注")
- private String endRemark;
-
- @Schema(description = "预计成交日期")
- @ExcelProperty("预计成交日期")
- private LocalDateTime dealTime;
-
- @Schema(description = "产品总金额", example = "12025")
- @ExcelProperty("产品总金额")
- private BigDecimal totalProductPrice;
-
- @Schema(description = "整单折扣")
- @ExcelProperty("整单折扣")
- private BigDecimal discountPercent;
-
- @Schema(description = "商机总金额", example = "12371")
- @ExcelProperty("商机总金额")
- private BigDecimal totalPrice;
-
- @Schema(description = "备注", example = "随便")
- @ExcelProperty("备注")
- private String remark;
-
- @Schema(description = "创建人", example = "1024")
- @ExcelProperty("创建人")
- private String creator;
- @Schema(description = "创建人名字", example = "芋道源码")
- @ExcelProperty("创建人名字")
- private String creatorName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
-
- @Schema(description = "产品列表")
- private List products;
-
- @Schema(description = "产品列表")
- @Data
- @NoArgsConstructor
- @AllArgsConstructor
- public static class Product {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
- private Long id;
-
- @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private Long productId;
- @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- private String productName;
- @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private String productNo;
- @Schema(description = "产品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- private Integer productUnit;
-
- @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal productPrice;
-
- @Schema(description = "商机价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal businessPrice;
-
- @Schema(description = "产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- private BigDecimal count;
-
- @Schema(description = "总计价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal totalPrice;
-
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
deleted file mode 100644
index 9275e0e032..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business.vo.business;
-
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.SysAdminUserParseFunction;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - CRM 商机创建/更新 Request VO")
-@Data
-public class CrmBusinessSaveReqVO {
-
- @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32129")
- private Long id;
-
- @Schema(description = "商机名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- @DiffLogField(name = "商机名称")
- @NotNull(message = "商机名称不能为空")
- private String name;
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10299")
- @DiffLogField(name = "客户", function = CrmCustomerParseFunction.NAME)
- @NotNull(message = "客户不能为空")
- private Long customerId;
-
- @Schema(description = "下次联系时间")
- @DiffLogField(name = "下次联系时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人用户编号", example = "14334")
- @NotNull(message = "负责人不能为空")
- @DiffLogField(name = "负责人", function = SysAdminUserParseFunction.NAME)
- private Long ownerUserId;
-
- @Schema(description = "商机状态组编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25714")
- @DiffLogField(name = "商机状态组")
- @NotNull(message = "商机状态组不能为空")
- private Long statusTypeId;
-
- @Schema(description = "预计成交日期")
- @DiffLogField(name = "预计成交日期")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime dealTime;
-
- @Schema(description = "整单折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "55.00")
- @DiffLogField(name = "整单折扣")
- @NotNull(message = "整单折扣不能为空")
- private BigDecimal discountPercent;
-
- @Schema(description = "备注", example = "随便")
- @DiffLogField(name = "备注")
- private String remark;
-
- @Schema(description = "联系人编号", example = "110")
- private Long contactId; // 使用场景，在【联系人详情】添加商机时，如果需要关联两者，需要传递 contactId 字段
-
- @Schema(description = "产品列表")
- private List products;
-
- @Schema(description = "产品列表")
- @Data
- @NoArgsConstructor
- @AllArgsConstructor
- public static class Product {
-
- @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- @NotNull(message = "产品编号不能为空")
- private Long productId;
-
- @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- @NotNull(message = "产品单价不能为空")
- private BigDecimal productPrice;
-
- @Schema(description = "商机价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- @NotNull(message = "商机价格不能为空")
- private BigDecimal businessPrice;
-
- @Schema(description = "产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- @NotNull(message = "产品数量不能为空")
- private Integer count;
-
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessUpdateStatusReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessUpdateStatusReqVO.java
deleted file mode 100644
index 3fe7d9f47f..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessUpdateStatusReqVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business.vo.business;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.crm.enums.business.CrmBusinessEndStatusEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - CRM 商机更新状态 Request VO")
-@Data
-public class CrmBusinessUpdateStatusReqVO {
-
- @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32129")
- @NotNull(message = "商机编号不能为空")
- private Long id;
-
- @Schema(description = "状态编号", example = "1")
- private Long statusId;
-
- @Schema(description = "结束状态", example = "1")
- @InEnum(value = CrmBusinessEndStatusEnum.class)
- private Integer endStatus;
-
- @AssertTrue(message = "变更状态不正确")
- public boolean isStatusValid() {
- return statusId != null || endStatus != null;
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusRespVO.java
deleted file mode 100644
index a2ee1dfe5a..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusRespVO.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business.vo.status;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管理后台 - 商机状态 Response VO")
-@Data
-public class CrmBusinessStatusRespVO {
-
- @Schema(description = "状态组编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2934")
- private Long id;
-
- @Schema(description = "状态组名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- private String name;
-
- @Schema(description = "使用的部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
- private List deptIds;
- @Schema(description = "使用的部门名称", requiredMode = Schema.RequiredMode.REQUIRED)
- private List deptNames;
-
- @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
- private String creator;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
- @Schema(description = "状态集合", requiredMode = Schema.RequiredMode.REQUIRED)
- private List statuses;
-
- @Data
- public static class Status {
-
- @Schema(description = "状态编号", example = "23899")
- private Long id;
-
- @Schema(description = "状态名", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
- private String name;
-
- @Schema(description = "赢单率", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
- private BigDecimal percent;
-
- @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer sort;
-
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
deleted file mode 100644
index 42d6620e90..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/status/CrmBusinessStatusSaveReqVO.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.business.vo.status;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.List;
-
-@Schema(description = "管理后台 - 商机状态组新增/修改 Request VO")
-@Data
-public class CrmBusinessStatusSaveReqVO {
-
- @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2934")
- private Long id;
-
- @Schema(description = "状态类型名", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- @NotEmpty(message = "状态类型名不能为空")
- private String name;
-
- @Schema(description = "使用的部门编号")
- private List deptIds;
-
- @Schema(description = "商机状态集合", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "商机状态集合不能为空")
- @Valid
- private List statuses;
-
- @Data
- public static class Status {
-
- @Schema(description = "状态编号", example = "23899")
- private Long id;
-
- @Schema(description = "状态名", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
- @NotEmpty(message = "状态名不能为空")
- private String name;
-
- @Schema(description = "赢单率", requiredMode = Schema.RequiredMode.REQUIRED, example = "50")
- @NotNull(message = "赢单率不能为空")
- private BigDecimal percent;
-
- @Schema(description = "排序", hidden = true, example = "1")
- private Integer sort;
-
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
deleted file mode 100644
index eeae08b985..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/CrmClueController.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.clue;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmCluePageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmClueRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmClueSaveReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.clue.vo.CrmClueTransferReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.clue.CrmClueDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
-import cn.iocoder.yudao.module.crm.service.clue.CrmClueService;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertListByFlatMap;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-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 = "管理后台 - 线索")
-@RestController
-@RequestMapping("/crm/clue")
-@Validated
-public class CrmClueController {
-
- @Resource
- private CrmClueService clueService;
- @Resource
- private CrmCustomerService customerService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建线索")
- @PreAuthorize("@ss.hasPermission('crm:clue:create')")
- public CommonResult createClue(@Valid @RequestBody CrmClueSaveReqVO createReqVO) {
- return success(clueService.createClue(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新线索")
- @PreAuthorize("@ss.hasPermission('crm:clue:update')")
- public CommonResult updateClue(@Valid @RequestBody CrmClueSaveReqVO updateReqVO) {
- clueService.updateClue(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除线索")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:clue:delete')")
- public CommonResult deleteClue(@RequestParam("id") Long id) {
- clueService.deleteClue(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得线索")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:clue:query')")
- public CommonResult getClue(@RequestParam("id") Long id) {
- CrmClueDO clue = clueService.getClue(id);
- return success(buildClueDetail(clue));
- }
-
- private CrmClueRespVO buildClueDetail(CrmClueDO clue) {
- if (clue == null) {
- return null;
- }
- return buildClueDetailList(singletonList(clue)).get(0);
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得线索分页")
- @PreAuthorize("@ss.hasPermission('crm:clue:query')")
- public CommonResult> getCluePage(@Valid CrmCluePageReqVO pageVO) {
- PageResult pageResult = clueService.getCluePage(pageVO, getLoginUserId());
- return success(new PageResult<>(buildClueDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "导出线索 Excel")
- @PreAuthorize("@ss.hasPermission('crm:clue:export')")
- @OperateLog(type = EXPORT)
- public void exportClueExcel(@Valid CrmCluePageReqVO pageReqVO, HttpServletResponse response) throws IOException {
- pageReqVO.setPageSize(PAGE_SIZE_NONE);
- List list = clueService.getCluePage(pageReqVO, getLoginUserId()).getList();
- // 导出 Excel
- ExcelUtils.write(response, "线索.xls", "数据", CrmClueRespVO.class, buildClueDetailList(list));
- }
-
- private List buildClueDetailList(List list) {
- if (CollUtil.isEmpty(list)) {
- return Collections.emptyList();
- }
- // 1.1 获取客户列表
- Map customerMap = customerService.getCustomerMap(
- convertSet(list, CrmClueDO::getCustomerId));
- // 1.2 获取创建人、负责人列表
- Map userMap = adminUserApi.getUserMap(convertListByFlatMap(list,
- contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getOwnerUserId())));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
- // 2. 转换成 VO
- return BeanUtils.toBean(list, CrmClueRespVO.class, clueVO -> {
- clueVO.setAreaName(AreaUtils.format(clueVO.getAreaId()));
- // 2.1 设置客户名称
- MapUtils.findAndThen(customerMap, clueVO.getCustomerId(), customer -> clueVO.setCustomerName(customer.getName()));
- // 2.2 设置创建人、负责人名称
- MapUtils.findAndThen(userMap, NumberUtils.parseLong(clueVO.getCreator()),
- user -> clueVO.setCreatorName(user.getNickname()));
- MapUtils.findAndThen(userMap, clueVO.getOwnerUserId(), user -> {
- clueVO.setOwnerUserName(user.getNickname());
- MapUtils.findAndThen(deptMap, user.getDeptId(), dept -> clueVO.setOwnerUserDeptName(dept.getName()));
- });
- });
- }
-
- @PutMapping("/transfer")
- @Operation(summary = "线索转移")
- @PreAuthorize("@ss.hasPermission('crm:clue:update')")
- public CommonResult transferClue(@Valid @RequestBody CrmClueTransferReqVO reqVO) {
- clueService.transferClue(reqVO, getLoginUserId());
- return success(true);
- }
-
- @PutMapping("/transform")
- @Operation(summary = "线索转化为客户")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:clue:update')")
- public CommonResult transformClue(@RequestParam("id") Long id) {
- clueService.transformClue(id, getLoginUserId());
- return success(Boolean.TRUE);
- }
-
- @GetMapping("/follow-count")
- @Operation(summary = "获得分配给我的、待跟进的线索数量")
- @PreAuthorize("@ss.hasPermission('crm:clue:query')")
- public CommonResult getFollowClueCount() {
- return success(clueService.getFollowClueCount(getLoginUserId()));
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
deleted file mode 100644
index a63d946e9d..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.clue.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.CrmSceneTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 线索分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class CrmCluePageReqVO extends PageParam {
-
- @Schema(description = "线索名称", example = "线索xxx")
- private String name;
-
- @Schema(description = "转化状态", example = "2048")
- private Boolean transformStatus;
-
- @Schema(description = "电话", example = "18000000000")
- private String telephone;
-
- @Schema(description = "手机号", example = "18000000000")
- private String mobile;
-
- @Schema(description = "场景类型", example = "1")
- @InEnum(CrmSceneTypeEnum.class)
- private Integer sceneType; // 场景类型，为 null 时则表示全部
-
- @Schema(description = "是否为公海数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
- private Boolean pool; // null 则表示为不是公海数据
-
- @Schema(description = "所属行业", example = "1")
- private Integer industryId;
-
- @Schema(description = "客户等级", example = "1")
- private Integer level;
-
- @Schema(description = "客户来源", example = "1")
- private Integer source;
-
- @Schema(description = "跟进状态", example = "true")
- private Boolean followUpStatus;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java
deleted file mode 100644
index 56e5c25612..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueRespVO.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.clue.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 线索 Response VO")
-@Data
-@ToString(callSuper = true)
-@ExcelIgnoreUnannotated
-public class CrmClueRespVO {
-
- @Schema(description = "编号，主键自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "10969")
- @ExcelProperty("编号")
- private Long id;
-
- @Schema(description = "线索名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "线索xxx")
- @ExcelProperty("线索名称")
- private String name;
-
- @Schema(description = "跟进状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @ExcelProperty(value = "跟进状态", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.BOOLEAN_STRING)
- private Boolean followUpStatus;
-
- @Schema(description = "最后跟进时间")
- @ExcelProperty("最后跟进时间")
- private LocalDateTime contactLastTime;
-
- @Schema(description = "最后跟进内容", example = "吃饭、睡觉、打逗逗")
- @ExcelProperty("最后跟进内容")
- private String contactLastContent;
-
- @Schema(description = "下次联系时间", example = "2023-10-18 01:00:00")
- @ExcelProperty("下次联系时间")
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人编号")
- private Long ownerUserId;
- @Schema(description = "负责人名字", example = "25682")
- @ExcelProperty("负责人名字")
- private String ownerUserName;
- @Schema(description = "负责人部门")
- @ExcelProperty("负责人部门")
- private String ownerUserDeptName;
-
- @Schema(description = "转化状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @ExcelProperty(value = "转化状态", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.BOOLEAN_STRING)
- private Boolean transformStatus;
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "520")
- private Long customerId;
- @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "客户名称")
- @ExcelProperty("客户名称")
- private String customerName;
-
- @Schema(description = "手机号", example = "18000000000")
- @ExcelProperty("手机号")
- private String mobile;
-
- @Schema(description = "电话", example = "18000000000")
- @ExcelProperty("电话")
- private String telephone;
-
- @Schema(description = "QQ", example = "25682")
- @ExcelProperty("QQ")
- private String qq;
-
- @Schema(description = "wechat", example = "25682")
- @ExcelProperty("wechat")
- private String wechat;
-
- @Schema(description = "email", example = "25682")
- @ExcelProperty("email")
- private String email;
-
- @Schema(description = "地区编号", example = "1024")
- @ExcelProperty("地区编号")
- private Integer areaId;
- @Schema(description = "地区名称", example = "北京市")
- @ExcelProperty("地区名称")
- private String areaName;
- @Schema(description = "详细地址", example = "北京市成华大道")
- @ExcelProperty("详细地址")
- private String detailAddress;
-
- @Schema(description = "所属行业", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "所属行业", converter = DictConvert.class)
- @DictFormat(cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_INDUSTRY)
- private Integer industryId;
-
- @Schema(description = "客户等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "客户等级", converter = DictConvert.class)
- @DictFormat(cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_LEVEL)
- private Integer level;
-
- @Schema(description = "客户来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "客户来源", converter = DictConvert.class)
- @DictFormat(cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_SOURCE)
- private Integer source;
-
- @Schema(description = "备注", example = "随便")
- @ExcelProperty("备注")
- private String remark;
-
- @Schema(description = "创建人", example = "1024")
- @ExcelProperty("创建人")
- private String creator;
- @Schema(description = "创建人名字", example = "芋道源码")
- @ExcelProperty("创建人名字")
- private String creatorName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
deleted file mode 100644
index aff2ad1eb8..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueSaveReqVO.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.clue.vo;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.framework.common.validation.Mobile;
-import cn.iocoder.yudao.framework.common.validation.Telephone;
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.module.crm.enums.customer.CrmCustomerLevelEnum;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerIndustryParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerLevelParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerSourceParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.SysAreaParseFunction;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_INDUSTRY;
-
-@Schema(description = "管理后台 - CRM 线索创建/更新 Request VO")
-@Data
-public class CrmClueSaveReqVO {
-
- @Schema(description = "编号", example = "10969")
- private Long id;
-
- @Schema(description = "线索名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "线索xxx")
- @DiffLogField(name = "线索名称")
- @NotEmpty(message = "线索名称不能为空")
- private String name;
-
- @Schema(description = "最后跟进时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- @DiffLogField(name = "最后跟进时间")
- private LocalDateTime contactLastTime;
-
- @Schema(description = "下次联系时间", example = "2023-10-18 01:00:00")
- @DiffLogField(name = "下次联系时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人编号", example = "2048")
- @NotNull(message = "负责人编号不能为空")
- private Long ownerUserId;
-
- @Schema(description = "手机号", example = "18000000000")
- @DiffLogField(name = "手机号")
- @Mobile
- private String mobile;
-
- @Schema(description = "电话", example = "18000000000")
- @DiffLogField(name = "电话")
- @Telephone
- private String telephone;
-
- @Schema(description = "QQ", example = "123456789")
- @DiffLogField(name = "QQ")
- @Size(max = 20, message = "QQ长度不能超过 20 个字符")
- private String qq;
-
- @Schema(description = "微信", example = "123456789")
- @DiffLogField(name = "微信")
- @Size(max = 255, message = "微信长度不能超过 255 个字符")
- private String wechat;
-
- @Schema(description = "邮箱", example = "123456789@qq.com")
- @DiffLogField(name = "邮箱")
- @Email(message = "邮箱格式不正确")
- @Size(max = 255, message = "邮箱长度不能超过 255 个字符")
- private String email;
-
- @Schema(description = "地区编号", example = "20158")
- @DiffLogField(name = "地区编号", function = SysAreaParseFunction.NAME)
- private Integer areaId;
-
- @Schema(description = "详细地址", example = "北京市海淀区")
- @DiffLogField(name = "详细地址")
- private String detailAddress;
-
- @Schema(description = "所属行业", example = "1")
- @DiffLogField(name = "所属行业", function = CrmCustomerIndustryParseFunction.NAME)
- @DictFormat(CRM_CUSTOMER_INDUSTRY)
- private Integer industryId;
-
- @Schema(description = "客户等级", example = "2")
- @DiffLogField(name = "客户等级", function = CrmCustomerLevelParseFunction.NAME)
- @InEnum(CrmCustomerLevelEnum.class)
- private Integer level;
-
- @Schema(description = "客户来源", example = "3")
- @DiffLogField(name = "客户来源", function = CrmCustomerSourceParseFunction.NAME)
- private Integer source;
-
- @Schema(description = "客户描述", example = "任意文字")
- @DiffLogField(name = "客户描述")
- @Size(max = 4096, message = "客户描述长度不能超过 4096 个字符")
- private String description;
-
- @Schema(description = "备注", example = "随便")
- @DiffLogField(name = "备注")
- private String remark;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
deleted file mode 100644
index adf58a921f..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/CrmContactController.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contact;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.contact.vo.*;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
-import cn.iocoder.yudao.module.crm.service.contact.CrmContactBusinessService;
-import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-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
-@RequestMapping("/crm/contact")
-@Validated
-@Slf4j
-public class CrmContactController {
-
- @Resource
- private CrmContactService contactService;
- @Resource
- private CrmCustomerService customerService;
- @Resource
- private CrmContactBusinessService contactBusinessLinkService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建联系人")
- @PreAuthorize("@ss.hasPermission('crm:contact:create')")
- public CommonResult createContact(@Valid @RequestBody CrmContactSaveReqVO createReqVO) {
- return success(contactService.createContact(createReqVO, getLoginUserId()));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新联系人")
- @OperateLog(enable = false)
- @PreAuthorize("@ss.hasPermission('crm:contact:update')")
- public CommonResult updateContact(@Valid @RequestBody CrmContactSaveReqVO updateReqVO) {
- contactService.updateContact(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除联系人")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:contact:delete')")
- public CommonResult deleteContact(@RequestParam("id") Long id) {
- contactService.deleteContact(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得联系人")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:contact:query')")
- public CommonResult getContact(@RequestParam("id") Long id) {
- CrmContactDO contact = contactService.getContact(id);
- return success(buildContactDetail(contact));
- }
-
- private CrmContactRespVO buildContactDetail(CrmContactDO contact) {
- if (contact == null) {
- return null;
- }
- return buildContactDetailList(singletonList(contact)).get(0);
- }
-
- @GetMapping("/simple-all-list")
- @Operation(summary = "获得联系人的精简列表")
- @PreAuthorize("@ss.hasPermission('crm:contact:query')")
- public CommonResult> getSimpleContactList() {
- List list = contactService.getContactList(getLoginUserId());
- return success(convertList(list, contact -> // 只返回 id、name 字段
- new CrmContactRespVO().setId(contact.getId()).setName(contact.getName())
- .setCustomerId(contact.getCustomerId())));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得联系人分页")
- @PreAuthorize("@ss.hasPermission('crm:contact:query')")
- public CommonResult> getContactPage(@Valid CrmContactPageReqVO pageVO) {
- PageResult pageResult = contactService.getContactPage(pageVO, getLoginUserId());
- return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/page-by-customer")
- @Operation(summary = "获得联系人分页，基于指定客户")
- public CommonResult> getContactPageByCustomer(@Valid CrmContactPageReqVO pageVO) {
- Assert.notNull(pageVO.getCustomerId(), "客户编号不能为空");
- PageResult pageResult = contactService.getContactPageByCustomerId(pageVO);
- return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/page-by-business")
- @Operation(summary = "获得联系人分页，基于指定商机")
- public CommonResult> getContactPageByBusiness(@Valid CrmContactPageReqVO pageVO) {
- Assert.notNull(pageVO.getBusinessId(), "商机编号不能为空");
- PageResult pageResult = contactService.getContactPageByBusinessId(pageVO);
- return success(new PageResult<>(buildContactDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "导出联系人 Excel")
- @PreAuthorize("@ss.hasPermission('crm:contact:export')")
- @OperateLog(type = EXPORT)
- public void exportContactExcel(@Valid CrmContactPageReqVO exportReqVO,
- HttpServletResponse response) throws IOException {
- exportReqVO.setPageNo(PAGE_SIZE_NONE);
- List list = contactService.getContactPage(exportReqVO, getLoginUserId()).getList();
- ExcelUtils.write(response, "联系人.xls", "数据", CrmContactRespVO.class, buildContactDetailList(list));
- }
-
- private List buildContactDetailList(List contactList) {
- if (CollUtil.isEmpty(contactList)) {
- return Collections.emptyList();
- }
- // 1.1 获取客户列表
- Map customerMap = customerService.getCustomerMap(
- convertSet(contactList, CrmContactDO::getCustomerId));
- // 1.2 获取创建人、负责人列表
- Map userMap = adminUserApi.getUserMap(convertListByFlatMap(contactList,
- contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getOwnerUserId())));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
- // 1.3 直属上级 Map
- Map parentContactMap = contactService.getContactMap(
- convertSet(contactList, CrmContactDO::getParentId));
- // 2. 转换成 VO
- return BeanUtils.toBean(contactList, CrmContactRespVO.class, contactVO -> {
- contactVO.setAreaName(AreaUtils.format(contactVO.getAreaId()));
- // 2.1 设置客户名称
- MapUtils.findAndThen(customerMap, contactVO.getCustomerId(), customer -> contactVO.setCustomerName(customer.getName()));
- // 2.2 设置创建人、负责人名称
- MapUtils.findAndThen(userMap, NumberUtils.parseLong(contactVO.getCreator()),
- user -> contactVO.setCreatorName(user.getNickname()));
- MapUtils.findAndThen(userMap, contactVO.getOwnerUserId(), user -> {
- contactVO.setOwnerUserName(user.getNickname());
- MapUtils.findAndThen(deptMap, user.getDeptId(), dept -> contactVO.setOwnerUserDeptName(dept.getName()));
- });
- // 2.3 设置直属上级名称
- findAndThen(parentContactMap, contactVO.getParentId(), contact -> contactVO.setParentName(contact.getName()));
- });
- }
-
- @PutMapping("/transfer")
- @Operation(summary = "联系人转移")
- @PreAuthorize("@ss.hasPermission('crm:contact:update')")
- public CommonResult transferContact(@Valid @RequestBody CrmContactTransferReqVO reqVO) {
- contactService.transferContact(reqVO, getLoginUserId());
- return success(true);
- }
-
- // ================== 关联/取关商机 ===================
-
- @PostMapping("/create-business-list")
- @Operation(summary = "创建联系人与商机的关联")
- @PreAuthorize("@ss.hasPermission('crm:contact:create-business')")
- public CommonResult createContactBusinessList(@Valid @RequestBody CrmContactBusinessReqVO createReqVO) {
- contactBusinessLinkService.createContactBusinessList(createReqVO);
- return success(true);
- }
-
-
- @PostMapping("/create-business-list2")
- @Operation(summary = "创建联系人与商机的关联")
- @PreAuthorize("@ss.hasPermission('crm:contact:create-business')")
- public CommonResult createContactBusinessList2(@Valid @RequestBody CrmContactBusiness2ReqVO createReqVO) {
- contactBusinessLinkService.createContactBusinessList2(createReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete-business-list")
- @Operation(summary = "删除联系人与联系人的关联")
- @PreAuthorize("@ss.hasPermission('crm:contact:delete-business')")
- public CommonResult deleteContactBusinessList(@Valid @RequestBody CrmContactBusinessReqVO deleteReqVO) {
- contactBusinessLinkService.deleteContactBusinessList(deleteReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete-business-list2")
- @Operation(summary = "删除联系人与联系人的关联")
- @PreAuthorize("@ss.hasPermission('crm:contact:delete-business')")
- public CommonResult deleteContactBusinessList(@Valid @RequestBody CrmContactBusiness2ReqVO deleteReqVO) {
- contactBusinessLinkService.deleteContactBusinessList2(deleteReqVO);
- return success(true);
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBusiness2ReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBusiness2ReqVO.java
deleted file mode 100644
index edc07bf962..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBusiness2ReqVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Schema(description = "管理后台 - CRM 联系人商机 Request VO") // 【商机关联联系人】用于关联，取消关联的操作
-@Data
-public class CrmContactBusiness2ReqVO {
-
- @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7638")
- @NotNull(message="商机不能为空")
- private Long businessId;
-
- @Schema(description = "联系人编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "20878")
- @NotEmpty(message="联系人数组不能为空")
- private List contactIds;
-
-}
\ No newline at end of file
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBusinessReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBusinessReqVO.java
deleted file mode 100644
index aaac18e43e..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactBusinessReqVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Schema(description = "管理后台 - CRM 联系人商机 Request VO") // 【联系人关联商机】用于关联，取消关联的操作
-@Data
-public class CrmContactBusinessReqVO {
-
- @Schema(description = "联系人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20878")
- @NotNull(message="联系人不能为空")
- private Long contactId;
-
- @Schema(description = "商机编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "7638")
- @NotEmpty(message="商机不能为空")
- private List businessIds;
-
-}
\ No newline at end of file
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactPageReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactPageReqVO.java
deleted file mode 100644
index 6698a3855e..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactPageReqVO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contact.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.CrmSceneTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - CRM 联系人分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class CrmContactPageReqVO extends PageParam {
-
- @Schema(description = "姓名", example = "芋艿")
- private String name;
-
- @Schema(description = "客户编号", example = "10795")
- private Long customerId;
-
- @Schema(description = "手机号", example = "13898273941")
- private String mobile;
-
- @Schema(description = "电话", example = "021-383773")
- private String telephone;
-
- @Schema(description = "电子邮箱", example = "111@22.com")
- private String email;
-
- @Schema(description = "QQ", example = "3882872")
- private Long qq;
-
- @Schema(description = "微信", example = "zzZ98373")
- private String wechat;
-
- @Schema(description = "场景类型", example = "1")
- @InEnum(CrmSceneTypeEnum.class)
- private Integer sceneType; // 场景类型，为 null 时则表示全部
-
- @Schema(description = "商机编号", example = "10430")
- private Long businessId;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactRespVO.java
deleted file mode 100644
index b2b1e83848..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactRespVO.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - CRM 联系人 Response VO")
-@Data
-@ToString(callSuper = true)
-@ExcelIgnoreUnannotated
-public class CrmContactRespVO {
-
- @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "3167")
- private Long id;
-
- @Schema(description = "联系人姓名", example = "芋艿")
- @ExcelProperty(value = "联系人姓名", order = 1)
- private String name;
-
- @Schema(description = "客户编号", example = "10795")
- private Long customerId;
- @ExcelProperty(value = "客户名称", order = 2)
- @Schema(description = "客户名字", example = "test")
- private String customerName;
-
- @Schema(description = "最后跟进时间")
- @ExcelProperty(value = "最后跟进时间", order = 6)
- private LocalDateTime contactLastTime;
-
- @Schema(description = "最后跟进内容")
- @ExcelProperty(value = "最后跟进内容", order = 6)
- private String contactLastContent;
-
- @Schema(description = "下次联系时间")
- @ExcelProperty(value = "下次联系时间", order = 6)
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人编号")
- private Long ownerUserId;
- @Schema(description = "负责人名字", example = "25682")
- @ExcelProperty("负责人名字")
- private String ownerUserName;
- @Schema(description = "负责人部门")
- @ExcelProperty("负责人部门")
- private String ownerUserDeptName;
-
- @Schema(description = "手机号", example = "1387171766")
- @ExcelProperty(value = "手机号", order = 4)
- private String mobile;
-
- @Schema(description = "电话", example = "021-0029922")
- @ExcelProperty(value = "电话", order = 4)
- private String telephone;
-
- @Schema(description = "电子邮箱", example = "1111@22.com")
- @ExcelProperty(value = "邮箱", order = 4)
- private String email;
-
- @Schema(description = "QQ", example = "197272662")
- @ExcelProperty(value = "QQ", order = 4)
- private Long qq;
-
- @Schema(description = "微信", example = "zzz3883")
- @ExcelProperty(value = "微信", order = 4)
- private String wechat;
-
- @Schema(description = "地区编号", example = "20158")
- private Integer areaId;
- @Schema(description = "地区名", example = "上海上海市浦东新区")
- @ExcelProperty(value = "地区", order = 5)
- private String areaName;
-
- @Schema(description = "地址")
- @ExcelProperty(value = "地址", order = 5)
- private String detailAddress;
-
- @Schema(description = "性别")
- @ExcelProperty(value = "性别", converter = DictConvert.class, order = 3)
- @DictFormat(cn.iocoder.yudao.module.system.enums.DictTypeConstants.USER_SEX)
- private Integer sex;
-
- @Schema(description = "是否关键决策人")
- @ExcelProperty(value = "是否关键决策人", converter = DictConvert.class, order = 3)
- @DictFormat(DictTypeConstants.BOOLEAN_STRING)
- private Boolean master;
-
- @Schema(description = "职位")
- @ExcelProperty(value = "职位", order = 3)
- private String post;
-
- @Schema(description = "直属上级", example = "23457")
- private Long parentId;
- @Schema(description = "直属上级名", example = "芋头")
- @ExcelProperty(value = "直属上级", order = 4)
- private String parentName;
-
- @Schema(description = "备注", example = "你说的对")
- @ExcelProperty(value = "备注", order = 6)
- private String remark;
-
- @Schema(description = "创建人", example = "25682")
- private String creator;
- @Schema(description = "创建人名字", example = "test")
- @ExcelProperty(value = "创建人", order = 8)
- private String creatorName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactSaveReqVO.java
deleted file mode 100644
index f16af86bfa..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactSaveReqVO.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contact.vo;
-
-import cn.iocoder.yudao.framework.common.validation.Mobile;
-import cn.iocoder.yudao.framework.common.validation.Telephone;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.*;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-
-@Schema(description = "管理后台 - CRM 联系人创建/更新 Request VO")
-@Data
-public class CrmContactSaveReqVO {
-
- @Schema(description = "主键", example = "3167")
- private Long id;
-
- @Schema(description = "姓名", example = "芋艿")
- @NotNull(message = "姓名不能为空")
- @DiffLogField(name = "姓名")
- private String name;
-
- @Schema(description = "客户编号", example = "10795")
- @NotNull(message = "客户编号不能为空")
- @DiffLogField(name = "客户", function = CrmCustomerParseFunction.NAME)
- private Long customerId;
-
- @Schema(description = "下次联系时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
- @DiffLogField(name = "下次联系时间")
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人用户编号", example = "14334")
- @NotNull(message = "负责人不能为空")
- @DiffLogField(name = "负责人", function = SysAdminUserParseFunction.NAME)
- private Long ownerUserId;
-
- @Schema(description = "手机号", example = "1387171766")
- @Mobile
- @DiffLogField(name = "手机号")
- private String mobile;
-
- @Schema(description = "电话", example = "021-0029922")
- @Telephone
- @DiffLogField(name = "电话")
- private String telephone;
-
- @Schema(description = "QQ", example = "197272662")
- @DiffLogField(name = "QQ")
- private Long qq;
-
- @Schema(description = "微信", example = "zzz3883")
- @DiffLogField(name = "微信")
- private String wechat;
-
- @Schema(description = "电子邮箱", example = "1111@22.com")
- @DiffLogField(name = "邮箱")
- @Email
- private String email;
-
- @Schema(description = "地区编号", example = "20158")
- @DiffLogField(name = "所在地", function = SysAreaParseFunction.NAME)
- private Integer areaId;
-
- @Schema(description = "地址")
- @DiffLogField(name = "地址")
- private String detailAddress;
-
- @Schema(description = "性别")
- @DiffLogField(name = "性别", function = SysSexParseFunction.NAME)
- private Integer sex;
-
- @Schema(description = "是否关键决策人")
- @DiffLogField(name = "关键决策人", function = SysBooleanParseFunction.NAME)
- private Boolean master;
-
- @Schema(description = "职位")
- @DiffLogField(name = "职位")
- private String post;
-
- @Schema(description = "直属上级", example = "23457")
- @DiffLogField(name = "直属上级", function = CrmContactParseFunction.NAME)
- private Long parentId;
-
- @Schema(description = "备注", example = "你说的对")
- @DiffLogField(name = "备注")
- private String remark;
-
- @Schema(description = "关联商机 ID", example = "122233")
- private Long businessId; // 注意：该字段用于在【商机】详情界面「新建联系人」时，自动进行关联
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractConfigController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractConfigController.java
deleted file mode 100644
index 369260fcbc..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractConfigController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.config.CrmContractConfigRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.config.CrmContractConfigSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractConfigDO;
-import cn.iocoder.yudao.module.crm.service.contract.CrmContractConfigService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - CRM 合同配置")
-@RestController
-@RequestMapping("/crm/contract-config")
-@Validated
-public class CrmContractConfigController {
-
- @Resource
- private CrmContractConfigService contractConfigService;
-
- @GetMapping("/get")
- @Operation(summary = "获取合同配置")
- @PreAuthorize("@ss.hasPermission('crm:contract-config:query')")
- public CommonResult getCustomerPoolConfig() {
- CrmContractConfigDO config = contractConfigService.getContractConfig();
- return success(BeanUtils.toBean(config, CrmContractConfigRespVO.class));
- }
-
- @PutMapping("/save")
- @Operation(summary = "更新合同配置")
- @PreAuthorize("@ss.hasPermission('crm:contract-config:update')")
- public CommonResult saveCustomerPoolConfig(@Valid @RequestBody CrmContractConfigSaveReqVO updateReqVO) {
- contractConfigService.saveContractConfig(updateReqVO);
- return success(true);
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
deleted file mode 100644
index 5939fef4b4..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractPageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractSaveReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractTransferReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractProductDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductDO;
-import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
-import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
-import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
-import cn.iocoder.yudao.module.crm.service.product.CrmProductService;
-import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-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
-@RequestMapping("/crm/contract")
-@Validated
-public class CrmContractController {
-
- @Resource
- private CrmContractService contractService;
- @Resource
- private CrmCustomerService customerService;
- @Resource
- private CrmContactService contactService;
- @Resource
- private CrmBusinessService businessService;
- @Resource
- private CrmProductService productService;
- @Resource
- private CrmReceivableService receivableService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建合同")
- @PreAuthorize("@ss.hasPermission('crm:contract:create')")
- public CommonResult createContract(@Valid @RequestBody CrmContractSaveReqVO createReqVO) {
- return success(contractService.createContract(createReqVO, getLoginUserId()));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新合同")
- @PreAuthorize("@ss.hasPermission('crm:contract:update')")
- public CommonResult updateContract(@Valid @RequestBody CrmContractSaveReqVO updateReqVO) {
- contractService.updateContract(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除合同")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:contract:delete')")
- public CommonResult deleteContract(@RequestParam("id") Long id) {
- contractService.deleteContract(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得合同")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
- public CommonResult getContract(@RequestParam("id") Long id) {
- CrmContractDO contract = contractService.getContract(id);
- return success(buildContractDetail(contract));
- }
-
- private CrmContractRespVO buildContractDetail(CrmContractDO contract) {
- if (contract == null) {
- return null;
- }
- CrmContractRespVO contractVO = buildContractDetailList(singletonList(contract)).get(0);
- // 拼接产品项
- List businessProducts = contractService.getContractProductListByContractId(contractVO.getId());
- Map productMap = productService.getProductMap(
- convertSet(businessProducts, CrmContractProductDO::getProductId));
- contractVO.setProducts(BeanUtils.toBean(businessProducts, CrmContractRespVO.Product.class, businessProductVO ->
- MapUtils.findAndThen(productMap, businessProductVO.getProductId(),
- product -> businessProductVO.setProductName(product.getName())
- .setProductNo(product.getNo()).setProductUnit(product.getUnit()))));
- return contractVO;
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得合同分页")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
- public CommonResult> getContractPage(@Valid CrmContractPageReqVO pageVO) {
- PageResult pageResult = contractService.getContractPage(pageVO, getLoginUserId());
- return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
- }
-
- @GetMapping("/page-by-customer")
- @Operation(summary = "获得合同分页，基于指定客户")
- public CommonResult> getContractPageByCustomer(@Valid CrmContractPageReqVO pageVO) {
- Assert.notNull(pageVO.getCustomerId(), "客户编号不能为空");
- PageResult pageResult = contractService.getContractPageByCustomerId(pageVO);
- return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
- }
-
- @GetMapping("/page-by-business")
- @Operation(summary = "获得合同分页，基于指定商机")
- public CommonResult> getContractPageByBusiness(@Valid CrmContractPageReqVO pageVO) {
- Assert.notNull(pageVO.getBusinessId(), "商机编号不能为空");
- PageResult pageResult = contractService.getContractPageByBusinessId(pageVO);
- return success(BeanUtils.toBean(pageResult, CrmContractRespVO.class).setList(buildContractDetailList(pageResult.getList())));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "导出合同 Excel")
- @PreAuthorize("@ss.hasPermission('crm:contract:export')")
- @OperateLog(type = EXPORT)
- public void exportContractExcel(@Valid CrmContractPageReqVO exportReqVO,
- HttpServletResponse response) throws IOException {
- PageResult pageResult = contractService.getContractPage(exportReqVO, getLoginUserId());
- // 导出 Excel
- ExcelUtils.write(response, "合同.xls", "数据", CrmContractRespVO.class,
- BeanUtils.toBean(pageResult.getList(), CrmContractRespVO.class));
- }
-
- @PutMapping("/transfer")
- @Operation(summary = "合同转移")
- @PreAuthorize("@ss.hasPermission('crm:contract:update')")
- public CommonResult transferContract(@Valid @RequestBody CrmContractTransferReqVO reqVO) {
- contractService.transferContract(reqVO, getLoginUserId());
- return success(true);
- }
-
- @PutMapping("/submit")
- @Operation(summary = "提交合同审批")
- @PreAuthorize("@ss.hasPermission('crm:contract:update')")
- public CommonResult submitContract(@RequestParam("id") Long id) {
- contractService.submitContract(id, getLoginUserId());
- return success(true);
- }
-
- private List buildContractDetailList(List contractList) {
- if (CollUtil.isEmpty(contractList)) {
- return Collections.emptyList();
- }
- // 1.1 获取客户列表
- Map customerMap = customerService.getCustomerMap(
- convertSet(contractList, CrmContractDO::getCustomerId));
- // 1.2 获取创建人、负责人列表
- Map userMap = adminUserApi.getUserMap(convertListByFlatMap(contractList,
- contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getOwnerUserId())));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
- // 1.3 获取联系人
- Map contactMap = convertMap(contactService.getContactList(convertSet(contractList,
- CrmContractDO::getSignContactId)), CrmContactDO::getId);
- // 1.4 获取商机
- Map businessMap = businessService.getBusinessMap(
- convertSet(contractList, CrmContractDO::getBusinessId));
- // 1.5 获得已回款金额
- Map receivablePriceMap = receivableService.getReceivablePriceMapByContractId(
- convertSet(contractList, CrmContractDO::getId));
- // 2. 拼接数据
- return BeanUtils.toBean(contractList, CrmContractRespVO.class, contractVO -> {
- // 2.1 设置客户信息
- findAndThen(customerMap, contractVO.getCustomerId(), customer -> contractVO.setCustomerName(customer.getName()));
- // 2.2 设置用户信息
- findAndThen(userMap, Long.parseLong(contractVO.getCreator()), user -> contractVO.setCreatorName(user.getNickname()));
- MapUtils.findAndThen(userMap, contractVO.getOwnerUserId(), user -> {
- contractVO.setOwnerUserName(user.getNickname());
- MapUtils.findAndThen(deptMap, user.getDeptId(), dept -> contractVO.setOwnerUserDeptName(dept.getName()));
- });
- findAndThen(userMap, contractVO.getSignUserId(), user -> contractVO.setSignUserName(user.getNickname()));
- // 2.3 设置联系人信息
- findAndThen(contactMap, contractVO.getSignContactId(), contact -> contractVO.setSignContactName(contact.getName()));
- // 2.4 设置商机信息
- findAndThen(businessMap, contractVO.getBusinessId(), business -> contractVO.setBusinessName(business.getName()));
- // 2.5 设置已回款金额
- contractVO.setTotalReceivablePrice(receivablePriceMap.getOrDefault(contractVO.getId(), BigDecimal.ZERO));
- });
- }
-
- @GetMapping("/audit-count")
- @Operation(summary = "获得待审核合同数量")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
- public CommonResult getAuditContractCount() {
- return success(contractService.getAuditContractCount(getLoginUserId()));
- }
-
- @GetMapping("/remind-count")
- @Operation(summary = "获得即将到期（提醒）的合同数量")
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
- public CommonResult getRemindContractCount() {
- return success(contractService.getRemindContractCount(getLoginUserId()));
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "获得合同精简列表", description = "只包含的合同，主要用于前端的下拉选项")
- @Parameter(name = "customerId", description = "客户编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:contract:query')")
- public CommonResult> getContractSimpleList(@RequestParam("customerId") Long customerId) {
- CrmContractPageReqVO pageReqVO = new CrmContractPageReqVO().setCustomerId(customerId);
- pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); // 不分页
- PageResult pageResult = contractService.getContractPageByCustomerId(pageReqVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(Collections.emptyList());
- }
- // 拼接数据
- Map receivablePriceMap = receivableService.getReceivablePriceMapByContractId(
- convertSet(pageResult.getList(), CrmContractDO::getId));
- return success(convertList(pageResult.getList(), contract -> new CrmContractRespVO() // 只返回 id、name 等精简字段
- .setId(contract.getId()).setName(contract.getName()).setAuditStatus(contract.getAuditStatus())
- .setTotalPrice(contract.getTotalPrice())
- .setTotalReceivablePrice(receivablePriceMap.getOrDefault(contract.getId(), BigDecimal.ZERO))));
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/config/CrmContractConfigRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/config/CrmContractConfigRespVO.java
deleted file mode 100644
index c39cf92692..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/config/CrmContractConfigRespVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.config;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - CRM 合同配置 Response VO")
-@Data
-public class CrmContractConfigRespVO {
-
- @Schema(description = "是否开启提前提醒", example = "true")
- private Boolean notifyEnabled;
-
- @Schema(description = "提前提醒天数", example = "2")
- private Integer notifyDays;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/config/CrmContractConfigSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/config/CrmContractConfigSaveReqVO.java
deleted file mode 100644
index 2eb79d8e0a..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/config/CrmContractConfigSaveReqVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.config;
-
-import cn.hutool.core.util.BooleanUtil;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.AssertTrue;
-import java.util.Objects;
-
-@Schema(description = "管理后台 - CRM 合同配置 Request VO")
-@Data
-public class CrmContractConfigSaveReqVO {
-
- @Schema(description = "是否开启提前提醒", example = "true")
- @DiffLogField(name = "是否开启提前提醒")
- private Boolean notifyEnabled;
-
- @Schema(description = "提前提醒天数", example = "2")
- @DiffLogField(name = "提前提醒天数")
- private Integer notifyDays;
-
- @AssertTrue(message = "提前提醒天数不能为空")
- @JsonIgnore
- public boolean isNotifyDaysValid() {
- if (!BooleanUtil.isTrue(getNotifyEnabled())) {
- return true;
- }
- return Objects.nonNull(getNotifyDays());
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractPageReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractPageReqVO.java
deleted file mode 100644
index 74f8008b8f..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractPageReqVO.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
-import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - CRM 合同分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class CrmContractPageReqVO extends PageParam {
-
- /**
- * 过期类型 - 即将过期
- */
- public static final Integer EXPIRY_TYPE_ABOUT_TO_EXPIRE = 1;
- /**
- * 过期类型 - 已过期
- */
- public static final Integer EXPIRY_TYPE_EXPIRED = 2;
-
- @Schema(description = "合同编号", example = "XYZ008")
- private String no;
-
- @Schema(description = "合同名称", example = "王五")
- private String name;
-
- @Schema(description = "客户编号", example = "18336")
- private Long customerId;
-
- @Schema(description = "商机编号", example = "10864")
- private Long businessId;
-
- @Schema(description = "场景类型", example = "1")
- @InEnum(CrmSceneTypeEnum.class)
- private Integer sceneType; // 场景类型，为 null 时则表示全部
-
- @Schema(description = "审批状态", example = "20")
- @InEnum(CrmAuditStatusEnum.class)
- private Integer auditStatus;
-
- @Schema(description = "过期类型", example = "1")
- private Integer expiryType; // 过期类型，为 null 时则表示全部
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
deleted file mode 100644
index a01bc110b9..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管理后台 - CRM 合同 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CrmContractRespVO {
-
- @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
- @ExcelProperty("合同编号")
- private Long id;
-
- @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
- @ExcelProperty("合同名称")
- private String name;
-
- @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230101")
- @ExcelProperty("合同编号")
- private String no;
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @ExcelProperty("客户编号")
- private Long customerId;
- @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @ExcelProperty("客户名称")
- private String customerName;
-
- @Schema(description = "商机编号", example = "10864")
- @ExcelProperty("商机编号")
- private Long businessId;
- @Schema(description = "商机名称", example = "10864")
- @ExcelProperty("商机名称")
- private String businessName;
-
- @Schema(description = "最后跟进时间")
- @ExcelProperty("最后跟进时间")
- private LocalDateTime contactLastTime;
-
- @Schema(description = "负责人的用户编号", example = "25682")
- @ExcelProperty("负责人的用户编号")
- private Long ownerUserId;
- @Schema(description = "负责人名字", example = "25682")
- @ExcelProperty("负责人名字")
- private String ownerUserName;
- @Schema(description = "负责人部门")
- @ExcelProperty("负责人部门")
- private String ownerUserDeptName;
-
- @Schema(description = "工作流编号", example = "1043")
- @ExcelProperty("工作流编号")
- private String processInstanceId;
-
- @Schema(description = "审批状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- @ExcelProperty("审批状态")
- private Integer auditStatus;
-
- @Schema(description = "下单日期", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("下单日期")
- private LocalDateTime orderDate;
-
- @Schema(description = "开始时间")
- @ExcelProperty("开始时间")
- private LocalDateTime startTime;
-
- @Schema(description = "结束时间")
- @ExcelProperty("结束时间")
- private LocalDateTime endTime;
-
- @Schema(description = "产品总金额", example = "19510")
- @ExcelProperty("产品总金额")
- private BigDecimal totalProductPrice;
-
- @Schema(description = "整单折扣")
- @ExcelProperty("整单折扣")
- private BigDecimal discountPercent;
-
- @Schema(description = "合同金额", example = "5617")
- @ExcelProperty("合同金额")
- private BigDecimal totalPrice;
-
- @Schema(description = "已回款金额", example = "5617")
- @ExcelProperty("已回款金额")
- private BigDecimal totalReceivablePrice;
-
- @Schema(description = "客户签约人编号", example = "18546")
- private Long signContactId;
- @Schema(description = "客户签约人", example = "小豆")
- @ExcelProperty("客户签约人")
- private String signContactName;
-
- @Schema(description = "公司签约人", example = "14036")
- private Long signUserId;
- @Schema(description = "公司签约人", example = "小明")
- @ExcelProperty("公司签约人")
- private String signUserName;
-
- @Schema(description = "备注", example = "你猜")
- @ExcelProperty("备注")
- private String remark;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
- @Schema(description = "创建人", example = "25682")
- @ExcelProperty("创建人")
- private String creator;
-
- @Schema(description = "创建人名字", example = "test")
- @ExcelProperty("创建人名字")
- private String creatorName;
-
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
-
- @Schema(description = "产品列表")
- private List products;
-
- @Schema(description = "产品列表")
- @Data
- @NoArgsConstructor
- @AllArgsConstructor
- public static class Product {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
- private Long id;
-
- @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private Long productId;
- @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- private String productName;
- @Schema(description = "产品条码", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private String productNo;
- @Schema(description = "产品单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- private Integer productUnit;
-
- @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal productPrice;
-
- @Schema(description = "合同价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal contractPrice;
-
- @Schema(description = "产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- private BigDecimal count;
-
- @Schema(description = "总计价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal totalPrice;
-
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
deleted file mode 100644
index 9e06296f0f..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract;
-
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmBusinessParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmContactParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.SysAdminUserParseFunction;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - CRM 合同创建/更新 Request VO")
-@Data
-public class CrmContractSaveReqVO {
-
- @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
- private Long id;
-
- @Schema(description = "合同名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
- @DiffLogField(name = "合同名称")
- @NotNull(message = "合同名称不能为空")
- private String name;
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18336")
- @DiffLogField(name = "客户", function = CrmCustomerParseFunction.NAME)
- @NotNull(message = "客户编号不能为空")
- private Long customerId;
-
- @Schema(description = "商机编号", example = "10864")
- @DiffLogField(name = "商机", function = CrmBusinessParseFunction.NAME)
- private Long businessId;
-
- @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "17144")
- @DiffLogField(name = "负责人", function = SysAdminUserParseFunction.NAME)
- @NotNull(message = "负责人不能为空")
- private Long ownerUserId;
-
- @Schema(description = "下单日期", requiredMode = Schema.RequiredMode.REQUIRED)
- @DiffLogField(name = "下单日期")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- @NotNull(message = "下单日期不能为空")
- private LocalDateTime orderDate;
-
- @Schema(description = "开始时间")
- @DiffLogField(name = "开始时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime startTime;
-
- @Schema(description = "结束时间")
- @DiffLogField(name = "结束时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime endTime;
-
- @Schema(description = "整单折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "55.00")
- @DiffLogField(name = "整单折扣")
- @NotNull(message = "整单折扣不能为空")
- private BigDecimal discountPercent;
-
- @Schema(description = "合同金额", example = "5617")
- @DiffLogField(name = "合同金额")
- private BigDecimal totalPrice;
-
- @Schema(description = "客户签约人编号", example = "18546")
- @DiffLogField(name = "客户签约人", function = CrmContactParseFunction.NAME)
- private Long signContactId;
-
- @Schema(description = "公司签约人", example = "14036")
- @DiffLogField(name = "公司签约人", function = SysAdminUserParseFunction.NAME)
- private Long signUserId;
-
- @Schema(description = "备注", example = "你猜")
- @DiffLogField(name = "备注")
- private String remark;
-
- @Schema(description = "产品列表")
- private List products;
-
- @Schema(description = "产品列表")
- @Data
- @NoArgsConstructor
- @AllArgsConstructor
- public static class Product {
-
- @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- @NotNull(message = "产品编号不能为空")
- private Long productId;
-
- @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- @NotNull(message = "产品单价不能为空")
- private BigDecimal productPrice;
-
- @Schema(description = "合同价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- @NotNull(message = "合同价格不能为空")
- private BigDecimal contractPrice;
-
- @Schema(description = "产品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- @NotNull(message = "产品数量不能为空")
- private Integer count;
-
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
deleted file mode 100644
index 57c9fe65a2..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - CRM 合同转移 Request VO")
-@Data
-public class CrmContractTransferReqVO {
-
- @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 newOwnerUserId;
-
- @Schema(description = "老负责人加入团队后的权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @InEnum(value = CrmPermissionLevelEnum.class)
- private Integer oldOwnerPermissionLevel;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
deleted file mode 100644
index d661f6366e..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.iocoder.yudao.framework.common.core.KeyValue;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.enums.ExcelColumn;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.ip.core.Area;
-import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer.*;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerPoolConfigDO;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerPoolConfigService;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*;
-import static java.util.Collections.singletonList;
-
-@Tag(name = "管理后台 - CRM 客户")
-@RestController
-@RequestMapping("/crm/customer")
-@Validated
-public class CrmCustomerController {
-
- @Resource
- private CrmCustomerService customerService;
- @Resource
- private CrmCustomerPoolConfigService customerPoolConfigService;
-
- @Resource
- private DeptApi deptApi;
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DictDataApi dictDataApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建客户")
- @PreAuthorize("@ss.hasPermission('crm:customer:create')")
- public CommonResult createCustomer(@Valid @RequestBody CrmCustomerSaveReqVO createReqVO) {
- return success(customerService.createCustomer(createReqVO, getLoginUserId()));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新客户")
- @PreAuthorize("@ss.hasPermission('crm:customer:update')")
- public CommonResult updateCustomer(@Valid @RequestBody CrmCustomerSaveReqVO updateReqVO) {
- customerService.updateCustomer(updateReqVO);
- return success(true);
- }
-
- @PutMapping("/update-deal-status")
- @Operation(summary = "更新客户的成交状态")
- @Parameters({
- @Parameter(name = "id", description = "客户编号", required = true),
- @Parameter(name = "dealStatus", description = "成交状态", required = true)
- })
- public CommonResult updateCustomerDealStatus(@RequestParam("id") Long id,
- @RequestParam("dealStatus") Boolean dealStatus) {
- customerService.updateCustomerDealStatus(id, dealStatus);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除客户")
- @Parameter(name = "id", description = "客户编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:customer:delete')")
- public CommonResult deleteCustomer(@RequestParam("id") Long id) {
- customerService.deleteCustomer(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得客户")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:customer:query')")
- public CommonResult getCustomer(@RequestParam("id") Long id) {
- // 1. 获取客户
- CrmCustomerDO customer = customerService.getCustomer(id);
- // 2. 拼接数据
- return success(buildCustomerDetail(customer));
- }
-
- public CrmCustomerRespVO buildCustomerDetail(CrmCustomerDO customer) {
- if (customer == null) {
- return null;
- }
- return buildCustomerDetailList(singletonList(customer)).get(0);
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得客户分页")
- @PreAuthorize("@ss.hasPermission('crm:customer:query')")
- public CommonResult> getCustomerPage(@Valid CrmCustomerPageReqVO pageVO) {
- // 1. 查询客户分页
- PageResult pageResult = customerService.getCustomerPage(pageVO, getLoginUserId());
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(PageResult.empty(pageResult.getTotal()));
- }
- // 2. 拼接数据
- return success(new PageResult<>(buildCustomerDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- public List buildCustomerDetailList(List list) {
- if (CollUtil.isEmpty(list)) {
- return java.util.Collections.emptyList();
- }
- // 1.1 获取创建人、负责人列表
- Map userMap = adminUserApi.getUserMap(convertListByFlatMap(list,
- contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getOwnerUserId())));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
- // 1.2 获取距离进入公海的时间
- Map poolDayMap = getPoolDayMap(list);
- // 2. 转换成 VO
- return BeanUtils.toBean(list, CrmCustomerRespVO.class, customerVO -> {
- customerVO.setAreaName(AreaUtils.format(customerVO.getAreaId()));
- // 2.1 设置创建人、负责人名称
- MapUtils.findAndThen(userMap, NumberUtils.parseLong(customerVO.getCreator()),
- user -> customerVO.setCreatorName(user.getNickname()));
- MapUtils.findAndThen(userMap, customerVO.getOwnerUserId(), user -> {
- customerVO.setOwnerUserName(user.getNickname());
- MapUtils.findAndThen(deptMap, user.getDeptId(), dept -> customerVO.setOwnerUserDeptName(dept.getName()));
- });
- // 2.2 设置距离进入公海的时间
- if (customerVO.getOwnerUserId() != null) {
- customerVO.setPoolDay(poolDayMap.get(customerVO.getId()));
- }
- });
- }
-
- @GetMapping("/put-pool-remind-page")
- @Operation(summary = "获得待进入公海客户分页")
- @PreAuthorize("@ss.hasPermission('crm:customer:query')")
- public CommonResult> getPutPoolRemindCustomerPage(@Valid CrmCustomerPageReqVO pageVO) {
- // 1. 查询客户分页
- PageResult pageResult = customerService.getPutPoolRemindCustomerPage(pageVO, getLoginUserId());
- // 2. 拼接数据
- return success(new PageResult<>(buildCustomerDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/put-pool-remind-count")
- @Operation(summary = "获得待进入公海客户数量")
- @PreAuthorize("@ss.hasPermission('crm:customer:query')")
- public CommonResult getPutPoolRemindCustomerCount() {
- return success(customerService.getPutPoolRemindCustomerCount(getLoginUserId()));
- }
-
- @GetMapping("/today-contact-count")
- @Operation(summary = "获得今日需联系客户数量")
- @PreAuthorize("@ss.hasPermission('crm:customer:query')")
- public CommonResult getTodayContactCustomerCount() {
- return success(customerService.getTodayContactCustomerCount(getLoginUserId()));
- }
-
- @GetMapping("/follow-count")
- @Operation(summary = "获得分配给我、待跟进的线索数量的客户数量")
- @PreAuthorize("@ss.hasPermission('crm:customer:query')")
- public CommonResult getFollowCustomerCount() {
- return success(customerService.getFollowCustomerCount(getLoginUserId()));
- }
-
- /**
- * 获取距离进入公海的时间 Map
- *
- * @param list 客户列表
- * @return key 客户编号, value 距离进入公海的时间
- */
- private Map getPoolDayMap(List list) {
- CrmCustomerPoolConfigDO poolConfig = customerPoolConfigService.getCustomerPoolConfig();
- if (poolConfig == null || !poolConfig.getEnabled()) {
- return MapUtil.empty();
- }
- list = CollectionUtils.filterList(list, customer -> {
- // 特殊：如果没负责人，则说明已经在公海，不用计算
- if (customer.getOwnerUserId() == null) {
- return false;
- }
- // 已成交 or 已锁定，不进入公海
- return !customer.getDealStatus() && !customer.getLockStatus();
- });
- return convertMap(list, CrmCustomerDO::getId, customer -> {
- // 1.1 未成交放入公海天数
- long dealExpireDay = poolConfig.getDealExpireDays() - LocalDateTimeUtils.between(customer.getOwnerTime());
- // 1.2 未跟进放入公海天数
- LocalDateTime lastTime = customer.getOwnerTime();
- if (customer.getContactLastTime() != null && customer.getContactLastTime().isAfter(lastTime)) {
- lastTime = customer.getContactLastTime();
- }
- long contactExpireDay = poolConfig.getContactExpireDays() - LocalDateTimeUtils.between(lastTime);
- // 2. 返回最小的天数
- long poolDay = Math.min(dealExpireDay, contactExpireDay);
- return poolDay > 0 ? poolDay : 0;
- });
- }
-
- @GetMapping(value = "/simple-list")
- @Operation(summary = "获取客户精简信息列表", description = "只包含有读权限的客户，主要用于前端的下拉选项")
- public CommonResult> getCustomerSimpleList() {
- CrmCustomerPageReqVO reqVO = new CrmCustomerPageReqVO();
- reqVO.setPageSize(PAGE_SIZE_NONE); // 不分页
- List list = customerService.getCustomerPage(reqVO, getLoginUserId()).getList();
- return success(convertList(list, customer -> // 只返回 id、name 精简字段
- new CrmCustomerRespVO().setId(customer.getId()).setName(customer.getName())));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "导出客户 Excel")
- @PreAuthorize("@ss.hasPermission('crm:customer:export')")
- @OperateLog(type = EXPORT)
- public void exportCustomerExcel(@Valid CrmCustomerPageReqVO pageVO,
- HttpServletResponse response) throws IOException {
- pageVO.setPageSize(PAGE_SIZE_NONE); // 不分页
- List list = customerService.getCustomerPage(pageVO, getLoginUserId()).getList();
- // 导出 Excel
- ExcelUtils.write(response, "客户.xls", "数据", CrmCustomerRespVO.class,
- buildCustomerDetailList(list));
- }
-
- @GetMapping("/get-import-template")
- @Operation(summary = "获得导入客户模板")
- public void importTemplate(HttpServletResponse response) throws IOException {
- // 手动创建导出 demo
- List list = Arrays.asList(
- CrmCustomerImportExcelVO.builder().name("芋道").industryId(1).level(1).source(1)
- .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").build(),
- CrmCustomerImportExcelVO.builder().name("源码").industryId(1).level(1).source(1)
- .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn")
- .areaId(null).detailAddress("").remark("").build()
- );
- // 输出
- ExcelUtils.write(response, "客户导入模板.xls", "客户列表", CrmCustomerImportExcelVO.class, list, builderSelectMap());
- }
-
- private List>> builderSelectMap() {
- List>> selectMap = new ArrayList<>();
- // 获取地区下拉数据
- // TODO @puhui999：嘿嘿，这里改成省份、城市、区域，三个选项，难度大么？
- Area area = AreaUtils.getArea(Area.ID_CHINA);
- selectMap.add(new KeyValue<>(ExcelColumn.G, AreaUtils.getAreaNodePathList(area.getChildren())));
- // 获取客户所属行业
- List customerIndustries = dictDataApi.getDictDataLabelList(CRM_CUSTOMER_INDUSTRY);
- selectMap.add(new KeyValue<>(ExcelColumn.I, customerIndustries));
- // 获取客户等级
- List customerLevels = dictDataApi.getDictDataLabelList(CRM_CUSTOMER_LEVEL);
- selectMap.add(new KeyValue<>(ExcelColumn.J, customerLevels));
- // 获取客户来源
- List customerSources = dictDataApi.getDictDataLabelList(CRM_CUSTOMER_SOURCE);
- selectMap.add(new KeyValue<>(ExcelColumn.K, customerSources));
- return selectMap;
- }
-
- @PostMapping("/import")
- @Operation(summary = "导入客户")
- @PreAuthorize("@ss.hasPermission('system:customer:import')")
- public CommonResult importExcel(@Valid @RequestBody CrmCustomerImportReqVO importReqVO)
- throws Exception {
- List list = ExcelUtils.read(importReqVO.getFile(), CrmCustomerImportExcelVO.class);
- return success(customerService.importCustomerList(list, importReqVO));
- }
-
- @PutMapping("/transfer")
- @Operation(summary = "转移客户")
- @PreAuthorize("@ss.hasPermission('crm:customer:update')")
- public CommonResult transferCustomer(@Valid @RequestBody CrmCustomerTransferReqVO reqVO) {
- customerService.transferCustomer(reqVO, getLoginUserId());
- return success(true);
- }
-
- @PutMapping("/lock")
- @Operation(summary = "锁定/解锁客户")
- @PreAuthorize("@ss.hasPermission('crm:customer:update')")
- public CommonResult lockCustomer(@Valid @RequestBody CrmCustomerLockReqVO lockReqVO) {
- customerService.lockCustomer(lockReqVO, getLoginUserId());
- return success(true);
- }
-
- // ==================== 公海相关操作 ====================
-
- @PutMapping("/put-pool")
- @Operation(summary = "数据放入公海")
- @Parameter(name = "id", description = "客户编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:customer:update')")
- public CommonResult putCustomerPool(@RequestParam("id") Long id) {
- customerService.putCustomerPool(id);
- return success(true);
- }
-
- @PutMapping("/receive")
- @Operation(summary = "领取公海客户")
- @Parameter(name = "ids", description = "编号数组", required = true, example = "1,2,3")
- @PreAuthorize("@ss.hasPermission('crm:customer:receive')")
- public CommonResult receiveCustomer(@RequestParam(value = "ids") List ids) {
- customerService.receiveCustomer(ids, getLoginUserId(), Boolean.TRUE);
- return success(true);
- }
-
- @PutMapping("/distribute")
- @Operation(summary = "分配公海给对应负责人")
- @PreAuthorize("@ss.hasPermission('crm:customer:distribute')")
- public CommonResult distributeCustomer(@Valid @RequestBody CrmCustomerDistributeReqVO distributeReqVO) {
- customerService.receiveCustomer(distributeReqVO.getIds(), distributeReqVO.getOwnerUserId(), Boolean.FALSE);
- return success(true);
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerLimitConfigController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerLimitConfigController.java
deleted file mode 100644
index 82a326c054..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerLimitConfigController.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.limitconfig.CrmCustomerLimitConfigPageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.limitconfig.CrmCustomerLimitConfigRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.customer.vo.limitconfig.CrmCustomerLimitConfigSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerLimitConfigDO;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerLimitConfigService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
-
-@Tag(name = "管理后台 - CRM 客户限制配置")
-@RestController
-@RequestMapping("/crm/customer-limit-config")
-@Validated
-public class CrmCustomerLimitConfigController {
-
- @Resource
- private CrmCustomerLimitConfigService customerLimitConfigService;
-
- @Resource
- private DeptApi deptApi;
- @Resource
- private AdminUserApi adminUserApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建客户限制配置")
- @PreAuthorize("@ss.hasPermission('crm:customer-limit-config:create')")
- public CommonResult createCustomerLimitConfig(@Valid @RequestBody CrmCustomerLimitConfigSaveReqVO createReqVO) {
- return success(customerLimitConfigService.createCustomerLimitConfig(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新客户限制配置")
- @PreAuthorize("@ss.hasPermission('crm:customer-limit-config:update')")
- public CommonResult updateCustomerLimitConfig(@Valid @RequestBody CrmCustomerLimitConfigSaveReqVO updateReqVO) {
- customerLimitConfigService.updateCustomerLimitConfig(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除客户限制配置")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:customer-limit-config:delete')")
- public CommonResult deleteCustomerLimitConfig(@RequestParam("id") Long id) {
- customerLimitConfigService.deleteCustomerLimitConfig(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得客户限制配置")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:customer-limit-config:query')")
- public CommonResult getCustomerLimitConfig(@RequestParam("id") Long id) {
- CrmCustomerLimitConfigDO limitConfig = customerLimitConfigService.getCustomerLimitConfig(id);
- // 拼接数据
- Map userMap = adminUserApi.getUserMap(limitConfig.getUserIds());
- Map deptMap = deptApi.getDeptMap(limitConfig.getDeptIds());
- return success(BeanUtils.toBean(limitConfig, CrmCustomerLimitConfigRespVO.class, configVO -> {
- configVO.setUsers(CollectionUtils.convertList(configVO.getUserIds(), userMap::get));
- configVO.setDepts(CollectionUtils.convertList(configVO.getDeptIds(), deptMap::get));
- }));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得客户限制配置分页")
- @PreAuthorize("@ss.hasPermission('crm:customer-limit-config:query')")
- public CommonResult> getCustomerLimitConfigPage(@Valid CrmCustomerLimitConfigPageReqVO pageVO) {
- PageResult pageResult = customerLimitConfigService.getCustomerLimitConfigPage(pageVO);
- if (CollUtil.isEmpty(pageResult.getList())) {
- return success(PageResult.empty(pageResult.getTotal()));
- }
- // 拼接数据
- Map userMap = adminUserApi.getUserMap(
- convertSetByFlatMap(pageResult.getList(), CrmCustomerLimitConfigDO::getUserIds, Collection::stream));
- Map deptMap = deptApi.getDeptMap(
- convertSetByFlatMap(pageResult.getList(), CrmCustomerLimitConfigDO::getDeptIds, Collection::stream));
- return success(BeanUtils.toBean(pageResult, CrmCustomerLimitConfigRespVO.class, configVO -> {
- configVO.setUsers(CollectionUtils.convertList(configVO.getUserIds(), userMap::get));
- configVO.setDepts(CollectionUtils.convertList(configVO.getDeptIds(), deptMap::get));
- }));
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerDistributeReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerDistributeReqVO.java
deleted file mode 100644
index 4f8b0d4e86..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerDistributeReqVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Schema(description = "管理后台 - CRM 客户分配公海给对应负责人 Request VO")
-@Data
-public class CrmCustomerDistributeReqVO {
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1024]")
- @NotEmpty(message = "客户编号不能为空")
- private List ids;
-
- @Schema(description = "负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @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/customer/vo/customer/CrmCustomerImportExcelVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
deleted file mode 100644
index 2c39472fd6..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportExcelVO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.AreaConvert;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.*;
-
-/**
- * 客户 Excel 导入 VO
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
-public class CrmCustomerImportExcelVO {
-
- @ExcelProperty("客户名称")
- private String name;
-
- @ExcelProperty("手机")
- private String mobile;
-
- @ExcelProperty("电话")
- private String telephone;
-
- @ExcelProperty("QQ")
- private String qq;
-
- @ExcelProperty("微信")
- private String wechat;
-
- @ExcelProperty("邮箱")
- private String email;
-
- @ExcelProperty(value = "地区", converter = AreaConvert.class)
- private Integer areaId;
-
- @ExcelProperty("详细地址")
- private String detailAddress;
-
- @ExcelProperty(value = "所属行业", converter = DictConvert.class)
- @DictFormat(CRM_CUSTOMER_INDUSTRY)
- private Integer industryId;
-
- @ExcelProperty(value = "客户等级", converter = DictConvert.class)
- @DictFormat(CRM_CUSTOMER_LEVEL)
- private Integer level;
-
- @ExcelProperty(value = "客户来源", converter = DictConvert.class)
- @DictFormat(CRM_CUSTOMER_SOURCE)
- private Integer source;
-
- @ExcelProperty("备注")
- private String remark;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java
deleted file mode 100644
index bbf7163935..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 客户导入 Request VO")
-@Data
-@Builder
-public class CrmCustomerImportReqVO {
-
- @Schema(description = "Excel 文件", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "Excel 文件不能为空")
- private MultipartFile file;
-
- @Schema(description = "是否支持更新", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "是否支持更新不能为空")
- private Boolean updateSupport;
-
- @Schema(description = "负责人", example = "1")
- private Long ownerUserId; // 为 null 则客户进入公海
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportRespVO.java
deleted file mode 100644
index dda5bc5d11..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportRespVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-@Schema(description = "管理后台 - 客户导入 Response VO")
-@Data
-@Builder
-public class CrmCustomerImportRespVO {
-
- @Schema(description = "创建成功的客户名数组", requiredMode = Schema.RequiredMode.REQUIRED)
- private List createCustomerNames;
-
- @Schema(description = "更新成功的客户名数组", requiredMode = Schema.RequiredMode.REQUIRED)
- private List updateCustomerNames;
-
- @Schema(description = "导入失败的客户集合，key 为客户名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
- private Map failureCustomerNames;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerLockReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerLockReqVO.java
deleted file mode 100644
index 10bf2e10af..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerLockReqVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - CRM 客户锁定/解锁 Request VO")
-@Data
-public class CrmCustomerLockReqVO {
-
- @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- private Long id;
-
- @Schema(description = "客户锁定状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
- private Boolean lockStatus;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java
deleted file mode 100644
index 73af5d6b13..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerPageReqVO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - CRM 客户分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class CrmCustomerPageReqVO extends PageParam {
-
- /**
- * 联系状态 - 今日需联系
- */
- public static final int CONTACT_TODAY = 1;
- /**
- * 联系状态 - 已逾期
- */
- public static final int CONTACT_EXPIRED = 2;
- /**
- * 联系状态 - 已联系
- */
- public static final int CONTACT_ALREADY = 3;
-
- @Schema(description = "客户名称", example = "赵六")
- private String name;
-
- @Schema(description = "手机", example = "18000000000")
- private String mobile;
-
- @Schema(description = "所属行业", example = "1")
- private Integer industryId;
-
- @Schema(description = "客户等级", example = "1")
- private Integer level;
-
- @Schema(description = "客户来源", example = "1")
- private Integer source;
-
- @Schema(description = "场景类型", example = "1")
- @InEnum(CrmSceneTypeEnum.class)
- private Integer sceneType; // 场景类型，为 null 时则表示全部
-
- @Schema(description = "是否为公海数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
- private Boolean pool; // null 则表示为不是公海数据
-
- @Schema(description = "联系状态", example = "1")
- private Integer contactStatus; // backlog 查询条件
-
- @Schema(description = "跟进状态", example = "true")
- private Boolean followUpStatus;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
deleted file mode 100644
index 236129918c..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerRespVO.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.infra.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - CRM 客户 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CrmCustomerRespVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty("编号")
- private Long id;
-
- @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty("客户名称")
- private String name;
-
- @Schema(description = "跟进状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "跟进状态", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.BOOLEAN_STRING)
- private Boolean followUpStatus;
-
- @Schema(description = "最后跟进时间")
- @ExcelProperty("最后跟进时间")
- private LocalDateTime contactLastTime;
-
- @Schema(description = "最后跟进内容", example = "吃饭、睡觉、打逗逗")
- @ExcelProperty("最后跟进内容")
- private String contactLastContent;
-
- @Schema(description = "下次联系时间")
- @ExcelProperty("下次联系时间")
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人的用户编号", example = "25682")
- @ExcelProperty("负责人的用户编号")
- private Long ownerUserId;
- @Schema(description = "负责人名字", example = "25682")
- @ExcelProperty("负责人名字")
- private String ownerUserName;
- @Schema(description = "负责人部门")
- @ExcelProperty("负责人部门")
- private String ownerUserDeptName;
-
- @Schema(description = "锁定状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "锁定状态", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.BOOLEAN_STRING)
- private Boolean lockStatus;
-
- @Schema(description = "成交状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "成交状态", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.BOOLEAN_STRING)
- private Boolean dealStatus;
-
- @Schema(description = "手机", example = "25682")
- @ExcelProperty("手机")
- private String mobile;
-
- @Schema(description = "电话", example = "25682")
- @ExcelProperty("电话")
- private String telephone;
-
- @Schema(description = "QQ", example = "25682")
- @ExcelProperty("QQ")
- private String qq;
-
- @Schema(description = "wechat", example = "25682")
- @ExcelProperty("wechat")
- private String wechat;
-
- @Schema(description = "email", example = "25682")
- @ExcelProperty("email")
- private String email;
-
- @Schema(description = "地区编号", example = "1024")
- @ExcelProperty("地区编号")
- private Integer areaId;
- @Schema(description = "地区名称", example = "北京市")
- @ExcelProperty("地区名称")
- private String areaName;
- @Schema(description = "详细地址", example = "北京市成华大道")
- @ExcelProperty("详细地址")
- private String detailAddress;
-
- @Schema(description = "所属行业", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "所属行业", converter = DictConvert.class)
- @DictFormat(cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_INDUSTRY)
- private Integer industryId;
-
- @Schema(description = "客户等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "客户等级", converter = DictConvert.class)
- @DictFormat(cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_LEVEL)
- private Integer level;
-
- @Schema(description = "客户来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @ExcelProperty(value = "客户来源", converter = DictConvert.class)
- @DictFormat(cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_SOURCE)
- private Integer source;
-
- @Schema(description = "负责人的用户编号", example = "25682")
- @ExcelProperty("备注")
- private String remark;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
-
- @Schema(description = "创建人", example = "1024")
- @ExcelProperty("创建人")
- private String creator;
- @Schema(description = "创建人名字", example = "芋道源码")
- @ExcelProperty("创建人名字")
- private String creatorName;
-
- @Schema(description = "距离加入公海时间", example = "1")
- private Long poolDay;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
deleted file mode 100644
index daedb78300..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerSaveReqVO.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.framework.common.validation.Mobile;
-import cn.iocoder.yudao.framework.common.validation.Telephone;
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.module.crm.enums.customer.CrmCustomerLevelEnum;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerIndustryParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerLevelParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmCustomerSourceParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.SysAreaParseFunction;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_CUSTOMER_INDUSTRY;
-
-@Schema(description = "管理后台 - CRM 客户新增/修改 Request VO")
-@Data
-public class CrmCustomerSaveReqVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- private Long id;
-
- @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
- @DiffLogField(name = "客户名称")
- @NotEmpty(message = "客户名称不能为空")
- private String name;
-
- @Schema(description = "下次联系时间")
- @DiffLogField(name = "下次联系时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime contactNextTime;
-
- @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- @NotNull(message = "负责人的用户编号不能为空")
- private Long ownerUserId;
-
- @Schema(description = "手机", example = "18000000000")
- @DiffLogField(name = "手机")
- @Mobile
- private String mobile;
-
- @Schema(description = "电话", example = "18000000000")
- @DiffLogField(name = "电话")
- @Telephone
- private String telephone;
-
- @Schema(description = "QQ", example = "123456789")
- @DiffLogField(name = "QQ")
- @Size(max = 20, message = "QQ长度不能超过 20 个字符")
- private String qq;
-
- @Schema(description = "微信", example = "123456789")
- @DiffLogField(name = "微信")
- @Size(max = 255, message = "微信长度不能超过 255 个字符")
- private String wechat;
-
- @Schema(description = "邮箱", example = "123456789@qq.com")
- @DiffLogField(name = "邮箱")
- @Email(message = "邮箱格式不正确")
- @Size(max = 255, message = "邮箱长度不能超过 255 个字符")
- private String email;
-
- @Schema(description = "地区编号", example = "20158")
- @DiffLogField(name = "地区编号", function = SysAreaParseFunction.NAME)
- private Integer areaId;
-
- @Schema(description = "详细地址", example = "北京市海淀区")
- @DiffLogField(name = "详细地址")
- private String detailAddress;
-
- @Schema(description = "所属行业", example = "1")
- @DiffLogField(name = "所属行业", function = CrmCustomerIndustryParseFunction.NAME)
- @DictFormat(CRM_CUSTOMER_INDUSTRY)
- private Integer industryId;
-
- @Schema(description = "客户等级", example = "2")
- @DiffLogField(name = "客户等级", function = CrmCustomerLevelParseFunction.NAME)
- @InEnum(CrmCustomerLevelEnum.class)
- private Integer level;
-
- @Schema(description = "客户来源", example = "3")
- @DiffLogField(name = "客户来源", function = CrmCustomerSourceParseFunction.NAME)
- private Integer source;
-
- @Schema(description = "备注", example = "随便")
- @DiffLogField(name = "备注")
- private String remark;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
deleted file mode 100644
index fb6bed0798..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.customer.vo.customer;
-
-import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - CRM 客户转移 Request VO")
-@Data
-public class CrmCustomerTransferReqVO {
-
- @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 newOwnerUserId;
-
- /**
- * 老负责人加入团队后的权限级别。如果 null 说明移除
- *
- * 关联 {@link CrmPermissionLevelEnum}
- */
- @Schema(description = "老负责人加入团队后的权限级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Integer oldOwnerPermissionLevel;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
deleted file mode 100644
index c36c572e51..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.followup;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.followup.vo.CrmFollowUpRecordPageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.followup.vo.CrmFollowUpRecordRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.followup.vo.CrmFollowUpRecordSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contact.CrmContactDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.followup.CrmFollowUpRecordDO;
-import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
-import cn.iocoder.yudao.module.crm.service.contact.CrmContactService;
-import cn.iocoder.yudao.module.crm.service.followup.CrmFollowUpRecordService;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-
-@Tag(name = "管理后台 - 跟进记录")
-@RestController
-@RequestMapping("/crm/follow-up-record")
-@Validated
-public class CrmFollowUpRecordController {
-
- @Resource
- private CrmFollowUpRecordService followUpRecordService;
- @Resource
- private CrmContactService contactService;
- @Resource
- private CrmBusinessService businessService;
-
- @Resource
- private AdminUserApi adminUserApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建跟进记录")
- @PreAuthorize("@ss.hasPermission('crm:follow-up-record:create')")
- public CommonResult createFollowUpRecord(@Valid @RequestBody CrmFollowUpRecordSaveReqVO createReqVO) {
- return success(followUpRecordService.createFollowUpRecord(createReqVO));
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除跟进记录")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:follow-up-record:delete')")
- public CommonResult deleteFollowUpRecord(@RequestParam("id") Long id) {
- followUpRecordService.deleteFollowUpRecord(id, getLoginUserId());
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得跟进记录")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:follow-up-record:query')")
- public CommonResult getFollowUpRecord(@RequestParam("id") Long id) {
- CrmFollowUpRecordDO followUpRecord = followUpRecordService.getFollowUpRecord(id);
- return success(BeanUtils.toBean(followUpRecord, CrmFollowUpRecordRespVO.class));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得跟进记录分页")
- @PreAuthorize("@ss.hasPermission('crm:follow-up-record:query')")
- public CommonResult> getFollowUpRecordPage(@Valid CrmFollowUpRecordPageReqVO pageReqVO) {
- PageResult pageResult = followUpRecordService.getFollowUpRecordPage(pageReqVO);
- // 1.1 查询联系人和商机
- Map contactMap = contactService.getContactMap(
- convertSetByFlatMap(pageResult.getList(), item -> item.getContactIds().stream()));
- Map businessMap = businessService.getBusinessMap(
- convertSetByFlatMap(pageResult.getList(), item -> item.getBusinessIds().stream()));
- // 1.2 查询用户
- Map userMap = adminUserApi.getUserMap(
- convertSet(pageResult.getList(), item -> Long.valueOf(item.getCreator())));
- // 2. 拼接数据
- PageResult voPageResult = BeanUtils.toBean(pageResult, CrmFollowUpRecordRespVO.class, record -> {
- // 2.1 设置联系人和商机信息
- record.setBusinesses(new ArrayList<>()).setContacts(new ArrayList<>());
- record.getContactIds().forEach(id -> MapUtils.findAndThen(contactMap, id, contact ->
- record.getContacts().add(new CrmBusinessRespVO().setId(contact.getId()).setName(contact.getName()))));
- record.getContactIds().forEach(id -> MapUtils.findAndThen(businessMap, id, business ->
- record.getBusinesses().add(new CrmBusinessRespVO().setId(business.getId()).setName(business.getName()))));
- // 2.2 设置用户信息
- MapUtils.findAndThen(userMap, Long.valueOf(record.getCreator()), user -> record.setCreatorName(user.getNickname()));
- });
- return success(voPageResult);
- }
-
-}
\ No newline at end of file
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/vo/CrmFollowUpRecordRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/vo/CrmFollowUpRecordRespVO.java
deleted file mode 100644
index 1ce10b73e3..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/vo/CrmFollowUpRecordRespVO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.followup.vo;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessRespVO;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.module.crm.enums.DictTypeConstants.CRM_FOLLOW_UP_TYPE;
-
-@Schema(description = "管理后台 - 跟进记录 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CrmFollowUpRecordRespVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "28800")
- private Long id;
-
- @Schema(description = "数据类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Integer bizType;
-
- @Schema(description = "数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "5564")
- private Long bizId;
-
- @Schema(description = "跟进类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @DictFormat(CRM_FOLLOW_UP_TYPE)
- private Integer type;
-
- @Schema(description = "跟进内容", requiredMode = Schema.RequiredMode.REQUIRED)
- private String content;
-
- @Schema(description = "下次联系时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime nextTime;
-
- @Schema(description = "关联的商机编号数组")
- private List businessIds;
- @Schema(description = "关联的商机数组")
- private List businesses;
-
- @Schema(description = "关联的联系人编号数组")
- private List contactIds;
- @Schema(description = "关联的联系人名称数组")
- private List contacts;
-
- @Schema(description = "图片")
- private List picUrls;
- @Schema(description = "附件")
- private List fileUrls;
-
- @Schema(description = "创建人", example = "1024")
- @ExcelProperty("创建人")
- private String creator;
- @Schema(description = "创建人名字", example = "芋道源码")
- @ExcelProperty("创建人名字")
- private String creatorName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
\ No newline at end of file
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
deleted file mode 100644
index fa49076f8d..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.operatelog;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-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.operatelog.vo.CrmOperateLogPageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.operatelog.vo.CrmOperateLogRespVO;
-import cn.iocoder.yudao.module.crm.enums.LogRecordConstants;
-import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
-import cn.iocoder.yudao.module.system.api.logger.OperateLogApi;
-import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogV2PageReqDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.module.crm.enums.LogRecordConstants.*;
-
-@Tag(name = "管理后台 - CRM 操作日志")
-@RestController
-@RequestMapping("/crm/operate-log")
-@Validated
-public class CrmOperateLogController {
-
- @Resource
- private OperateLogApi operateLogApi;
-
- /**
- * {@link CrmBizTypeEnum} 与 {@link LogRecordConstants} 的映射关系
- */
- private static final Map BIZ_TYPE_MAP = new HashMap<>();
-
- static {
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_CLUE.getType(), CRM_CLUE_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_CUSTOMER.getType(), CRM_CUSTOMER_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_CONTACT.getType(), CRM_CONTACT_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_BUSINESS.getType(), CRM_BUSINESS_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_CONTRACT.getType(), CRM_CONTRACT_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_PRODUCT.getType(), CRM_PRODUCT_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_RECEIVABLE.getType(), CRM_RECEIVABLE_TYPE);
- BIZ_TYPE_MAP.put(CrmBizTypeEnum.CRM_RECEIVABLE_PLAN.getType(), CRM_RECEIVABLE_PLAN_TYPE);
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得操作日志")
- @PreAuthorize("@ss.hasPermission('crm:operate-log:query')")
- public CommonResult> getCustomerOperateLog(@Valid CrmOperateLogPageReqVO pageReqVO) {
- OperateLogV2PageReqDTO reqDTO = new OperateLogV2PageReqDTO();
- reqDTO.setPageSize(PAGE_SIZE_NONE); // 默认不分页，需要分页需注释
- reqDTO.setBizType(BIZ_TYPE_MAP.get(pageReqVO.getBizType())).setBizId(pageReqVO.getBizId());
- return success(BeanUtils.toBean(operateLogApi.getOperateLogPage(reqDTO), CrmOperateLogRespVO.class));
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/vo/CrmOperateLogRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/vo/CrmOperateLogRespVO.java
deleted file mode 100644
index 8e458a8a0f..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/vo/CrmOperateLogRespVO.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.operatelog.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - CRM 操作日志 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CrmOperateLogRespVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- private Long id;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long userId;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
- private String userName;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer userType;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- private String type;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "修改客户")
- private String subType;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
- private Long bizId;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "将什么从什么改为了什么")
- private String action;
-
- @Schema(description = "编号", example = "{orderId: 1}")
- private String extra;
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-01-01")
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
deleted file mode 100644
index 51d0a0a571..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.permission;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionCreateReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.permission.vo.CrmPermissionUpdateReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.permission.CrmPermissionDO;
-import cn.iocoder.yudao.module.crm.enums.permission.CrmPermissionLevelEnum;
-import cn.iocoder.yudao.module.crm.framework.permission.core.annotations.CrmPermission;
-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.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.PostApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.dept.dto.PostRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import com.google.common.collect.Multimaps;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSetByFlatMap;
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - CRM 数据权限")
-@RestController
-@RequestMapping("/crm/permission")
-@Validated
-public class CrmPermissionController {
-
- @Resource
- private CrmPermissionService permissionService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
- @Resource
- private PostApi postApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建数据权限")
- @PreAuthorize("@ss.hasPermission('crm:permission:create')")
- @CrmPermission(bizTypeValue = "#reqVO.bizType", bizId = "#reqVO.bizId", level = CrmPermissionLevelEnum.OWNER)
- public CommonResult addPermission(@Valid @RequestBody CrmPermissionCreateReqVO reqVO) {
- permissionService.createPermission(BeanUtils.toBean(reqVO, CrmPermissionCreateReqBO.class));
- return success(true);
- }
-
- @PutMapping("/update")
- @Operation(summary = "编辑数据权限")
- @PreAuthorize("@ss.hasPermission('crm:permission:update')")
- @CrmPermission(bizTypeValue = "#updateReqVO.bizType", bizId = "#updateReqVO.bizId"
- , level = CrmPermissionLevelEnum.OWNER)
- public CommonResult updatePermission(@Valid @RequestBody CrmPermissionUpdateReqVO updateReqVO) {
- permissionService.updatePermission(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除数据权限")
- @Parameter(name = "ids", description = "数据权限编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:permission:delete')")
- public CommonResult deletePermission(@RequestParam("ids") Collection ids) {
- permissionService.deletePermissionBatch(ids, getLoginUserId());
- return success(true);
- }
-
- @DeleteMapping("/delete-self")
- @Operation(summary = "删除自己的数据权限")
- @Parameter(name = "id", description = "数据权限编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:permission:delete')")
- public CommonResult deleteSelfPermission(@RequestParam("id") Long id) {
- permissionService.deleteSelfPermission(id, getLoginUserId());
- return success(true);
- }
-
- @GetMapping("/list")
- @Operation(summary = "获得数据权限列表")
- @Parameters({
- @Parameter(name = "bizType", description = "CRM 类型", required = true, example = "2"),
- @Parameter(name = "bizId", description = "CRM 类型数据编号", required = true, example = "1024")
- })
- @PreAuthorize("@ss.hasPermission('crm:permission:query')")
- public CommonResult> getPermissionList(@RequestParam("bizType") Integer bizType,
- @RequestParam("bizId") Long bizId) {
- List permissions = permissionService.getPermissionListByBiz(bizType, bizId);
- if (CollUtil.isEmpty(permissions)) {
- return success(Collections.emptyList());
- }
-
- // 查询相关数据
- Map userMap = adminUserApi.getUserMap(
- convertSet(permissions, CrmPermissionDO::getUserId));
- Map deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
- Map postMap = postApi.getPostMap(
- convertSetByFlatMap(userMap.values(), AdminUserRespDTO::getPostIds,
- item -> item != null ? item.stream() : Stream.empty()));
- // 拼接数据
- return success(CollectionUtils.convertList(BeanUtils.toBean(permissions, CrmPermissionRespVO.class), item -> {
- findAndThen(userMap, item.getUserId(), user -> {
- item.setNickname(user.getNickname());
- findAndThen(deptMap, user.getDeptId(), deptRespDTO -> item.setDeptName(deptRespDTO.getName()));
- if (CollUtil.isEmpty(user.getPostIds())) {
- item.setPostNames(Collections.emptySet());
- return;
- }
- List postList = MapUtils.getList(Multimaps.forMap(postMap), user.getPostIds());
- item.setPostNames(CollectionUtils.convertSet(postList, PostRespDTO::getName));
- });
- return item;
- }));
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
deleted file mode 100644
index f6f17da4ce..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.product;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.product.vo.product.CrmProductPageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.product.vo.product.CrmProductRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.product.vo.product.CrmProductSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductCategoryDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductDO;
-import cn.iocoder.yudao.module.crm.service.product.CrmProductCategoryService;
-import cn.iocoder.yudao.module.crm.service.product.CrmProductService;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static java.util.Collections.singletonList;
-
-@Tag(name = "管理后台 - CRM 产品")
-@RestController
-@RequestMapping("/crm/product")
-@Validated
-public class CrmProductController {
-
- @Resource
- private CrmProductService productService;
- @Resource
- private CrmProductCategoryService productCategoryService;
-
- @Resource
- private AdminUserApi adminUserApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建产品")
- @PreAuthorize("@ss.hasPermission('crm:product:create')")
- public CommonResult createProduct(@Valid @RequestBody CrmProductSaveReqVO createReqVO) {
- return success(productService.createProduct(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新产品")
- @PreAuthorize("@ss.hasPermission('crm:product:update')")
- public CommonResult updateProduct(@Valid @RequestBody CrmProductSaveReqVO updateReqVO) {
- productService.updateProduct(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除产品")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:product:delete')")
- public CommonResult deleteProduct(@RequestParam("id") Long id) {
- productService.deleteProduct(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得产品")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:product:query')")
- public CommonResult getProduct(@RequestParam("id") Long id) {
- CrmProductDO product = productService.getProduct(id);
- return success(buildProductDetail(product));
- }
-
- private CrmProductRespVO buildProductDetail(CrmProductDO product) {
- if (product == null) {
- return null;
- }
- return buildProductDetailList(singletonList(product)).get(0);
- }
-
- @GetMapping("/simple-list")
- @Operation(summary = "获得产品精简列表", description = "只包含被开启的产品，主要用于前端的下拉选项")
- public CommonResult> getProductSimpleList() {
- List list = productService.getProductListByStatus(CommonStatusEnum.ENABLE.getStatus());
- return success(convertList(list, product -> new CrmProductRespVO().setId(product.getId()).setName(product.getName())
- .setUnit(product.getUnit()).setNo(product.getNo()).setPrice(product.getPrice())));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得产品分页")
- @PreAuthorize("@ss.hasPermission('crm:product:query')")
- public CommonResult> getProductPage(@Valid CrmProductPageReqVO pageVO) {
- PageResult pageResult = productService.getProductPage(pageVO);
- return success(new PageResult<>(buildProductDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/export-excel")
- @Operation(summary = "导出产品 Excel")
- @PreAuthorize("@ss.hasPermission('crm:product:export')")
- @OperateLog(type = EXPORT)
- public void exportProductExcel(@Valid CrmProductPageReqVO exportReqVO,
- HttpServletResponse response) throws IOException {
- exportReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List list = productService.getProductPage(exportReqVO).getList();
- // 导出 Excel
- ExcelUtils.write(response, "产品.xls", "数据", CrmProductRespVO.class,
- buildProductDetailList(list));
- }
-
- private List buildProductDetailList(List list) {
- if (CollUtil.isEmpty(list)) {
- return Collections.emptyList();
- }
- // 1.1 获得用户信息
- Map userMap = adminUserApi.getUserMap(
- convertSetByFlatMap(list, user -> Stream.of(Long.valueOf(user.getCreator()), user.getOwnerUserId())));
- // 1.2 获得分类信息
- Map categoryMap = productCategoryService.getProductCategoryMap(
- convertSet(list, CrmProductDO::getCategoryId));
- // 2. 拼接数据
- return BeanUtils.toBean(list, CrmProductRespVO.class, productVO -> {
- // 2.1 设置用户信息
- MapUtils.findAndThen(userMap, productVO.getOwnerUserId(), user -> productVO.setOwnerUserName(user.getNickname()));
- MapUtils.findAndThen(userMap, Long.valueOf(productVO.getCreator()), user -> productVO.setCreatorName(user.getNickname()));
- // 2.2 设置分类名称
- MapUtils.findAndThen(categoryMap, productVO.getCategoryId(), category -> productVO.setCategoryName(category.getName()));
- });
- }
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java
deleted file mode 100644
index 1f659aa77f..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.product.vo.product;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.crm.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - CRM 产品 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class CrmProductRespVO {
-
- @Schema(description = "产品编号", example = "20529")
- @ExcelProperty("产品编号")
- private Long id;
-
- @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "好产品")
- @ExcelProperty("产品名称")
- private String name;
-
- @Schema(description = "产品编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "12306")
- @ExcelProperty("产品编码")
- private String no;
-
- @Schema(description = "单位", example = "2")
- @ExcelProperty(value = "单位", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.CRM_PRODUCT_UNIT)
- private Integer unit;
-
- @Schema(description = "价格, 单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- @ExcelProperty("价格，单位：分")
- private BigDecimal price;
-
- @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "上架")
- @ExcelProperty(value = "单位", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.CRM_PRODUCT_STATUS)
- private Integer status;
-
- @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Long categoryId;
- @Schema(description = "产品分类名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "衣服")
- @ExcelProperty("产品分类")
- private String categoryName;
-
- @Schema(description = "产品描述", example = "你说的对")
- @ExcelProperty("产品描述")
- private String description;
-
- @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31926")
- private Long ownerUserId;
- @Schema(description = "负责人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
- @ExcelProperty("负责人")
- private String ownerUserName;
-
- @Schema(description = "创建人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String creator;
- @Schema(description = "创建人名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
- @ExcelProperty("创建人")
- private String creatorName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
- @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("更新时间")
- private LocalDateTime updateTime;
-
-}
diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
deleted file mode 100644
index 1c1a660677..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductSaveReqVO.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.product.vo.product;
-
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmProductStatusParseFunction;
-import cn.iocoder.yudao.module.crm.framework.operatelog.core.CrmProductUnitParseFunction;
-import com.mzt.logapi.starter.annotation.DiffLogField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-@Schema(description = "管理后台 - CRM 产品创建/修改 Request VO")
-@Data
-public class CrmProductSaveReqVO {
-
- @Schema(description = "产品编号", example = "20529")
- private Long id;
-
- @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "好产品")
- @NotNull(message = "产品名称不能为空")
- @DiffLogField(name = "产品名称")
- private String name;
-
- @Schema(description = "产品编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "12306")
- @NotNull(message = "产品编码不能为空")
- @DiffLogField(name = "产品编码")
- private String no;
-
- @Schema(description = "单位", example = "2")
- @DiffLogField(name = "单位", function = CrmProductUnitParseFunction.NAME)
- private Integer unit;
-
- @Schema(description = "价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "8911")
- @NotNull(message = "价格不能为空")
- @DiffLogField(name = "价格")
- private BigDecimal price;
-
- @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "上架")
- @NotNull(message = "状态不能为空")
- @DiffLogField(name = "状态", function = CrmProductStatusParseFunction.NAME)
- private Integer status;
-
- @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- @NotNull(message = "产品分类编号不能为空")
- @DiffLogField(name = "产品分类编号")
- private Long categoryId;
-
- @Schema(description = "产品描述", example = "你说的对")
- @DiffLogField(name = "产品描述")
- private String description;
-
- @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31926")
- @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/receivable/CrmReceivableController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
deleted file mode 100644
index af1e08c037..0000000000
--- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package cn.iocoder.yudao.module.crm.controller.admin.receivable;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.crm.controller.admin.contract.vo.contract.CrmContractRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivablePageReqVO;
-import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivableRespVO;
-import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.receivable.CrmReceivableSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
-import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
-import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
-import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
-import cn.iocoder.yudao.module.system.api.dept.DeptApi;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - CRM 回款")
-@RestController
-@RequestMapping("/crm/receivable")
-@Validated
-public class CrmReceivableController {
-
- @Resource
- private CrmReceivableService receivableService;
- @Resource
- private CrmContractService contractService;
- @Resource
- private CrmCustomerService customerService;
-
- @Resource
- private AdminUserApi adminUserApi;
- @Resource
- private DeptApi deptApi;
-
- @PostMapping("/create")
- @Operation(summary = "创建回款")
- @PreAuthorize("@ss.hasPermission('crm:receivable:create')")
- public CommonResult createReceivable(@Valid @RequestBody CrmReceivableSaveReqVO createReqVO) {
- return success(receivableService.createReceivable(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新回款")
- @PreAuthorize("@ss.hasPermission('crm:receivable:update')")
- public CommonResult updateReceivable(@Valid @RequestBody CrmReceivableSaveReqVO updateReqVO) {
- receivableService.updateReceivable(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除回款")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('crm:receivable:delete')")
- public CommonResult deleteReceivable(@RequestParam("id") Long id) {
- receivableService.deleteReceivable(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得回款")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:receivable:query')")
- public CommonResult getReceivable(@RequestParam("id") Long id) {
- CrmReceivableDO receivable = receivableService.getReceivable(id);
- return success(buildReceivableDetail(receivable));
- }
-
- private CrmReceivableRespVO buildReceivableDetail(CrmReceivableDO receivable) {
- if (receivable == null) {
- return null;
- }
- return buildReceivableDetailList(Collections.singletonList(receivable)).get(0);
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得回款分页")
- @PreAuthorize("@ss.hasPermission('crm:receivable:query')")
- public CommonResult> getReceivablePage(@Valid CrmReceivablePageReqVO pageReqVO) {
- PageResult pageResult = receivableService.getReceivablePage(pageReqVO, getLoginUserId());
- return success(new PageResult<>(buildReceivableDetailList(pageResult.getList()), pageResult.getTotal()));
- }
-
- @GetMapping("/page-by-customer")
- @Operation(summary = "获得回款分页，基于指定客户")
- public CommonResult> getReceivablePageByCustomer(@Valid CrmReceivablePageReqVO pageReqVO) {
- Assert.notNull(pageReqVO.getCustomerId(), "客户编号不能为空");
- PageResult