From ca552825168c74734088ed4694faff6d347f9d4b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 18 Jan 2024 12:06:14 +0800 Subject: [PATCH] =?UTF-8?q?=20CRM=EF=BC=9A=E5=95=86=E6=9C=BA=20code=20revi?= =?UTF-8?q?ew?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/optinal/crm_20240114.sql | 34 +------------------ .../crm/enums/business/CrmBizEndStatus.java | 5 ++- yudao-module-crm/yudao-module-crm-biz/pom.xml | 5 --- .../CrmBusinessStatusTypeController.java | 20 ++++------- .../vo/business/CrmBusinessSaveReqVO.java | 14 ++++---- .../product/CrmBusinessProductPageReqVO.java | 5 +-- .../vo/product/CrmBusinessProductRespVO.java | 3 -- .../product/CrmBusinessProductSaveReqVO.java | 15 ++++---- .../vo/status/CrmBusinessStatusSaveReqVO.java | 4 +-- .../type/CrmBusinessStatusTypeSaveReqVO.java | 2 +- .../CrmBusinessProductConvert.java | 1 + .../CrmBusinessStatusTypeConvert.java | 5 +-- .../dataobject/business/CrmBusinessDO.java | 9 +++-- .../business/CrmBusinessProductDO.java | 12 +++++-- .../business/CrmBusinessStatusDO.java | 4 +-- .../business/CrmBusinessStatusTypeDO.java | 2 +- .../business/CrmBusinessProductMapper.java | 6 ++-- .../business/CrmBusinessStatusTypeMapper.java | 2 ++ .../dal/mysql/contract/CrmContractMapper.java | 2 +- .../business/CrmBusinessServiceImpl.java | 8 +++++ 20 files changed, 60 insertions(+), 98 deletions(-) diff --git a/sql/mysql/optinal/crm_20240114.sql b/sql/mysql/optinal/crm_20240114.sql index 24f25d4ef..50e462c81 100644 --- a/sql/mysql/optinal/crm_20240114.sql +++ b/sql/mysql/optinal/crm_20240114.sql @@ -20,36 +20,4 @@ CREATE TABLE `crm_business_product` ( `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', `tenant_id` bigint(0) NOT NULL DEFAULT 1 COMMENT '租户编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商机产品关联表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for crm_business_status --- ---------------------------- -DROP TABLE IF EXISTS `crm_business_status`; -CREATE TABLE `crm_business_status` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `type_id` bigint(0) NOT NULL COMMENT '状态类型编号', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '状态名', - `percent` bigint(0) NULL DEFAULT NULL COMMENT '赢单率', - `sort` int(0) NULL DEFAULT NULL COMMENT '排序', - `tenant_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '租户编号', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商机状态' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for crm_business_status_type --- ---------------------------- -DROP TABLE IF EXISTS `crm_business_status_type`; -CREATE TABLE `crm_business_status_type` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '状态类型名', - `dept_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '使用的部门编号', - `status` int(0) NOT NULL DEFAULT 1 COMMENT '开启状态', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', - `tenant_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '租户编号', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商机状态类型' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商机产品关联表' ROW_FORMAT = Dynamic; \ No newline at end of file diff --git a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBizEndStatus.java b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBizEndStatus.java index f84610e8d..55548dbff 100644 --- a/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBizEndStatus.java +++ b/yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/business/CrmBizEndStatus.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.crm.enums.business; -import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.core.IntArrayValuable; import lombok.Getter; @@ -8,6 +7,7 @@ import lombok.RequiredArgsConstructor; import java.util.Arrays; +// TODO @lzxhqs：1）title、description、create 可以删除，非标准的 javadoc 注释哈，然后可以在类上加下这个类的注释；2）CrmBizEndStatus 改成 CrmBusinessEndStatus，非必要不缩写哈，可阅读比较重要 /** * @author lzxhqs * @version 1.0 @@ -18,12 +18,14 @@ import java.util.Arrays; @RequiredArgsConstructor @Getter public enum CrmBizEndStatus implements IntArrayValuable { + WIN(1, "赢单"), LOSE(2, "输单"), INVALID(3, "无效"); public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmBizEndStatus::getStatus).toArray(); + // TODO @lzxhqs：这里的方法，建议放到 49 行之后；一般类里是，静态变量，普通变量；静态方法；普通方法 public static boolean isWin(Integer status) { return ObjectUtil.equal(WIN.getStatus(), status); } @@ -49,4 +51,5 @@ public enum CrmBizEndStatus implements IntArrayValuable { 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 index 1d74efbef..9e1a9e152 100644 --- a/yudao-module-crm/yudao-module-crm-biz/pom.xml +++ b/yudao-module-crm/yudao-module-crm-biz/pom.xml @@ -22,11 +22,6 @@ yudao-module-system-api ${revision} - - cn.iocoder.boot - yudao-module-system-biz - ${revision} - cn.iocoder.boot yudao-module-crm-api diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java index 9f2e3fbf1..231f66683 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessStatusTypeController.java @@ -25,19 +25,17 @@ import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; import java.io.IOException; import java.util.Collection; import java.util.List; -import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -86,13 +84,13 @@ public class CrmBusinessStatusTypeController { @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('crm:business-status-type:query')") public CommonResult getBusinessStatusType(@RequestParam("id") Long id) { - CrmBusinessStatusTypeDO businessStatusType = businessStatusTypeService.getBusinessStatusType(id); + CrmBusinessStatusTypeDO statusType = businessStatusTypeService.getBusinessStatusType(id); // 处理状态回显 - // TODO @ljlleo：可以使用 CollectionUtils.convertSet 替代常用的 stream 操作，更简洁一点；下面几个也是哈； + // TODO @lzxhqs：可以在 businessStatusService 加个 getBusinessStatusListByTypeId 方法，直接返回 List 哈，常用的，尽量封装个简单易懂的方法，不用追求绝对通用哈； CrmBusinessStatusQueryVO queryVO = new CrmBusinessStatusQueryVO(); queryVO.setTypeId(id); List statusList = businessStatusService.selectList(queryVO); - return success(CrmBusinessStatusTypeConvert.INSTANCE.convert(businessStatusType, statusList)); + return success(CrmBusinessStatusTypeConvert.INSTANCE.convert(statusType, statusList)); } @GetMapping("/page") @@ -101,12 +99,6 @@ public class CrmBusinessStatusTypeController { public CommonResult> getBusinessStatusTypePage(@Valid CrmBusinessStatusTypePageReqVO pageReqVO) { PageResult pageResult = businessStatusTypeService.getBusinessStatusTypePage(pageReqVO); // 处理部门回显 - // TODO @ljlleo：可以使用 CollectionUtils.convertSet 替代常用的 stream 操作，更简洁一点；下面几个也是哈； -// Set deptIds = pageResult.getList().stream() -// .map(CrmBusinessStatusTypeDO::getDeptIds) -// .filter(Objects::nonNull) -// .flatMap(Collection::stream) -// .collect(Collectors.toSet()); Set deptIds = CollectionUtils.convertSetByFlatMap(pageResult.getList(), CrmBusinessStatusTypeDO::getDeptIds,Collection::stream); List deptList = deptApi.getDeptList(deptIds); return success(CrmBusinessStatusTypeConvert.INSTANCE.convertPage(pageResult, deptList)); 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 index b615211a2..672450c4a 100644 --- 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 @@ -17,7 +17,6 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -// TODO @ljileo：DiffLogField function 完善一下 @Schema(description = "管理后台 - CRM 商机创建/更新 Request VO") @Data public class CrmBusinessSaveReqVO { @@ -59,7 +58,7 @@ public class CrmBusinessSaveReqVO { @DiffLogField(name = "商机金额") private Integer price; - // TODO @ljileo：折扣使用 Integer 类型，存储时，默认 * 100；展示的时候，前端需要 / 100；避免精度丢失问题 + // TODO @lzxhqs：折扣使用 Integer 类型，存储时，默认 * 100；展示的时候，前端需要 / 100；避免精度丢失问题 @Schema(description = "整单折扣") @DiffLogField(name = "整单折扣") private Integer discountPercent; @@ -71,17 +70,16 @@ public class CrmBusinessSaveReqVO { @Schema(description = "备注", example = "随便") @DiffLogField(name = "备注") private String remark; - // TODO @ljileo：修改的时候，应该可以传递添加的产品； - @Schema(description = "联系人编号", example = "110") - @NotNull(message = "联系人编号不能为空") - private Long contactId; - @Schema(description = "1赢单2输单3无效", example = "1") + @Schema(description = "结束状态", example = "1") @InEnum(CrmBizEndStatus.class) private Integer endStatus; - @Schema(description = "商机产品列表", example = "") + // TODO @lzxhqs：不设置默认 new ArrayList<>()；一般 pojo 不设置默认值哈 + @Schema(description = "商机产品列表") private List products = new ArrayList<>(); + @Schema(description = "联系人编号", example = "110") + private Long contactId; // 使用场景，在【联系人详情】添加商机时，如果需要关联两者，需要传递 contactId 字段 } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductPageReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductPageReqVO.java index fcf406b5d..4804768a5 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductPageReqVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductPageReqVO.java @@ -6,10 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; - -/** - * @author lzxhqs - */ +// TODO @lzxhqs：这个类，如果没用到，可以考虑删除哈 @Schema(description = "管理后台 - 商机产品分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductRespVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductRespVO.java index 4d24bd3c5..d4996816f 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductRespVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductRespVO.java @@ -4,9 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -/** - * @author lzxhqs - */ @Schema(description = "管理后台 - 商机产品关联 Response VO") @Data @ExcelIgnoreUnannotated diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductSaveReqVO.java index ddcc603c9..286f1a256 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductSaveReqVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/product/CrmBusinessProductSaveReqVO.java @@ -6,9 +6,6 @@ import lombok.Data; import java.math.BigDecimal; -/** - * @author lzxhqs - */ @Schema(description = "管理后台 - CRM 商机产品关联表 创建/更新 Request VO") @Data public class CrmBusinessProductSaveReqVO { @@ -16,12 +13,14 @@ public class CrmBusinessProductSaveReqVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32129") private Long id; - @Schema(description = "商机ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320") - @NotNull(message = "商机ID不能为空") + // TODO @lzxhqs：这个字段，应该是 Long 类型 + @Schema(description = "商机编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320") + @NotNull(message = "商机编号不能为空") private Integer businessId; - @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320") - @NotNull(message = "产品ID不能为空") + // TODO @lzxhqs：这个字段，应该是 Long 类型 + @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320") + @NotNull(message = "产品编号不能为空") private Integer productId; @Schema(description = "产品单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320") @@ -44,7 +43,9 @@ public class CrmBusinessProductSaveReqVO { @NotNull(message = "小计（折扣后价格）不能为空") private BigDecimal subtotal; + // TODO @lzxhqs：字符串，用 @NotEmpty，因为要考虑 "" 前端搞了这个玩意 @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "30320") @NotNull(message = "单位不能为空") private String unit; + } 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 index c5ecf52d6..3327b09f7 100644 --- 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 @@ -21,11 +21,11 @@ public class CrmBusinessStatusSaveReqVO { @NotEmpty(message = "状态名不能为空") private String name; - // TODO @lilleo：percent 应该是 Integer； + // TODO @lzxhqs：：percent 应该是 Integer； @Schema(description = "赢单率") private String percent; - // TODO @lilleo：这个是不是不用前端新增和修改的时候传递，交给顺序计算出来，存储起来就好了； + // TODO @lzxhqs：这个是不是不用前端新增和修改的时候传递，交给顺序计算出来，存储起来就好了； @Schema(description = "排序") 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/type/CrmBusinessStatusTypeSaveReqVO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java index 3d61bed1d..23dc7742d 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/type/CrmBusinessStatusTypeSaveReqVO.java @@ -19,10 +19,10 @@ public class CrmBusinessStatusTypeSaveReqVO { @NotEmpty(message = "状态类型名不能为空") private String name; + // TODO @lzxhqs： VO 里面，我们不使用默认值哈。这里 Lists.newArrayList() 看看怎么去掉。上面 deptIds 也是类似噢 @Schema(description = "使用的部门编号", requiredMode = Schema.RequiredMode.REQUIRED) private List deptIds = Lists.newArrayList(); - // TODO @ljlleo VO 里面，我们不使用默认值哈。这里 Lists.newArrayList() 看看怎么去掉。上面 deptIds 也是类似噢 @Schema(description = "商机状态集合", requiredMode = Schema.RequiredMode.REQUIRED) private List statusList; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessproduct/CrmBusinessProductConvert.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessproduct/CrmBusinessProductConvert.java index c3b84d31f..2fcd54d84 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessproduct/CrmBusinessProductConvert.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessproduct/CrmBusinessProductConvert.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessProductDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +// TODO @lzxhqs：看看是不是用 BeanUtils 替代了 /** * @author lzxhqs * @version 1.0 diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessstatustype/CrmBusinessStatusTypeConvert.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessstatustype/CrmBusinessStatusTypeConvert.java index 301feb0d7..be203b580 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessstatustype/CrmBusinessStatusTypeConvert.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/businessstatustype/CrmBusinessStatusTypeConvert.java @@ -14,6 +14,7 @@ import java.util.Map; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; +// TODO @lzxhqs：看看是不是用 BeanUtils 替代了 /** * 商机状态类型 Convert * @@ -24,7 +25,6 @@ public interface CrmBusinessStatusTypeConvert { CrmBusinessStatusTypeConvert INSTANCE = Mappers.getMapper(CrmBusinessStatusTypeConvert.class); - CrmBusinessStatusTypeRespVO convert(CrmBusinessStatusTypeDO bean); PageResult convertPage(PageResult page); @@ -38,9 +38,6 @@ public interface CrmBusinessStatusTypeConvert { } default CrmBusinessStatusTypeRespVO convert(CrmBusinessStatusTypeDO bean, List statusList) { - // TODO @ljlleo 可以链式赋值，简化成一行； -// CrmBusinessStatusTypeRespVO result = convert(bean); -// result.setStatusList(statusList); return convert(bean).setStatusList(statusList); } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java index 68b5f087b..e11ec5935 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessDO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.crm.dal.dataobject.business; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO; -import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import cn.iocoder.yudao.module.crm.enums.business.CrmBizEndStatus; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -80,9 +80,9 @@ public class CrmBusinessDO extends BaseDO { */ private String remark; /** - * 1赢单2输单3无效 + * 结束状态 * - * TODO @lijie：搞个枚举； + * 枚举 {@link CrmBizEndStatus} */ private Integer endStatus; /** @@ -96,7 +96,7 @@ public class CrmBusinessDO extends BaseDO { /** * 跟进状态 * - * TODO @lijie：目前就是 Boolean；是否跟进 + * TODO @lzxhqs：目前就是 Boolean；是否跟进 */ private Integer followUpStatus; @@ -104,7 +104,6 @@ public class CrmBusinessDO extends BaseDO { * 负责人的用户编号 * * 关联 AdminUserDO 的 id 字段 - * {@link AdminUserDO#getId()} */ private Long ownerUserId; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java index 3f146c3b3..4558684e9 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessProductDO.java @@ -31,17 +31,20 @@ public class CrmBusinessProductDO extends BaseDO { private Long id; /** - * 商机ID + * 商机编号 + * * 关联 {@link CrmBusinessDO#getId()} */ private Long businessId; /** - * 产品ID - * 关联{@link CrmProductDO#getId()} + * 产品编号 + * + * 关联 {@link CrmProductDO#getId()} */ private Long productId; + // TODO @lzxhqs：改成 Integer，单位：分。目前整体倾向放大 100 倍哈 /** * 产品单价 */ @@ -52,16 +55,19 @@ public class CrmBusinessProductDO extends BaseDO { */ private BigDecimal salesPrice; + // TODO @lzxhqs：改成 count /** * 数量 */ private BigDecimal num; + // TODO @lzxhqs：改成 discountPercent /** * 折扣 */ private BigDecimal discount; + // TODO @lzxhqs：改成 totalPrice；总计价格，和现有项目风格一致； /** * 小计（折扣后价格） */ diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusDO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusDO.java index 40c99936b..17ce4f88c 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusDO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusDO.java @@ -35,9 +35,7 @@ public class CrmBusinessStatusDO { */ private String name; /** - * 赢单率 - * - * TODO 这里是不是改成 Integer 存储，百分比 * 100 ； + * 赢单率，百分比 */ private Integer percent; /** diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusTypeDO.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusTypeDO.java index 75f0094a1..aa9f86251 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusTypeDO.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/business/CrmBusinessStatusTypeDO.java @@ -44,7 +44,7 @@ public class CrmBusinessStatusTypeDO extends BaseDO { * 开启状态 * * TODO 改成 Integer，关联 CommonStatus - * {@link CommonStatusEnum} + * 枚举 {@link CommonStatusEnum} */ private Boolean status; diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessProductMapper.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessProductMapper.java index 37a193f1f..5750491d8 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessProductMapper.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessProductMapper.java @@ -6,16 +6,16 @@ import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessProductDO; import org.apache.ibatis.annotations.Mapper; /** - * 商机产品 Mapper + * 商机产品 Mapper // TODO @lzxhqs：类注释，和作者之间要有一个空行 * @author lzxhqs */ @Mapper public interface CrmBusinessProductMapper extends BaseMapperX { - default void deleteByBusinessId(Long id) { + default void deleteByBusinessId(Long id) { // TODO @lzxhqs：第一个方法，和类之间最好空一行； delete(CrmBusinessProductDO::getBusinessId, id); } - default CrmBusinessProductDO selectByBusinessId(Long id) { + default CrmBusinessProductDO selectByBusinessId(Long id) { // TODO @lzxhqs：id 最好改成 businessId，上面也是；这样一看更容易懂 return selectOne(CrmBusinessProductDO::getBusinessId, id); } } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessStatusTypeMapper.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessStatusTypeMapper.java index 9b90549a1..410ebf050 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessStatusTypeMapper.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessStatusTypeMapper.java @@ -29,6 +29,7 @@ public interface CrmBusinessStatusTypeMapper extends BaseMapperX { default Long selectCountByContactId(Long contactId) { return selectCount(CrmContractDO::getContactId, contactId); } - default CrmContractDO selectByBizId(Long businessId) { + default CrmContractDO selectByBizId(Long businessId) { // TODO @lzxhqs：1）方法和方法之间要有空行；2）selectCountByBusinessId，一个是应该求数量，一个是不要缩写 BizId 可读性； return selectOne(CrmContractDO::getBusinessId, businessId); } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java index 2feee4d69..a4d08f315 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java @@ -57,9 +57,11 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { @Resource private CrmBusinessProductMapper businessProductMapper; + // TODO @lzxhqs：不直接调用这个 mapper，要调用对方的 service；每个业务独立收敛 @Resource private CrmContractMapper contractMapper; + // TODO @lzxhqs：不直接调用这个 mapper，要调用对方的 service；每个业务独立收敛 @Resource private CrmContactBusinessMapper contactBusinessMapper; @Resource @@ -78,7 +80,9 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { .setOwnerUserId(userId); businessMapper.insert(business); // TODO 商机待定：插入商机与产品的关联表；校验商品存在 + // TODO lzxhqs：新增时，是不是不用调用这个方法哈； verifyCrmBusinessProduct(business.getId()); + // TODO @lzxhqs：用 CollUtils.isNotEmpty； if (!createReqVO.getProducts().isEmpty()) { createBusinessProducts(createReqVO.getProducts(), business.getId()); } @@ -95,6 +99,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { return business.getId(); } + // TODO @lzxhqs：CrmContactBusinessService 调用这个；这样逻辑才能收敛哈； /** * @param businessId 商机id * @param contactId 联系人id @@ -110,12 +115,14 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { } + // TODO @lzxhqs：这个方法注释格式不对；删除@description，然后把 插入商机产品关联表 作为方法注释； /** * @param products 产品集合 * @description 插入商机产品关联表 * @author lzxhqs */ private void createBusinessProducts(List products, Long businessId) { + // TODO @lzxhqs：可以用 CollectionUtils.convertList； List list = new ArrayList<>(); for (CrmBusinessProductSaveReqVO product : products) { CrmBusinessProductDO businessProductDO = CrmBusinessProductConvert.INSTANCE.convert(product); @@ -152,6 +159,7 @@ public class CrmBusinessServiceImpl implements CrmBusinessService { CrmBusinessDO updateObj = BeanUtils.toBean(updateReqVO, CrmBusinessDO.class); businessMapper.updateById(updateObj); // TODO 商机待定：插入商机与产品的关联表；校验商品存在 + // TODO @lzxhqs：更新时，可以调用 CollectionUtils 的 diffList，尽量避免这种先删除再插入；而是新增的插入、变更的更新，没的删除；不然这个表每次更新，会多好多数据； verifyCrmBusinessProduct(updateReqVO.getId()); if (!updateReqVO.getProducts().isEmpty()) { createBusinessProducts(updateReqVO.getProducts(), updateReqVO.getId());