BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 772b794374f0bfe6cc746d5fdd10f53c09c31cce

Authored by YunaiV
1 parent dab02113

📖 CRM：code review CRM 产品分类

Inline Side-by-side
Showing 3 changed files with 6 additions and 1 deletions
yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/LogRecordConstants.java
  View file @772b794
@@ -60,6 +60,7 @@ public interface LogRecordConstants { @@ -60,6 +60,7 @@ public interface LogRecordConstants {
60 60
61 // ======================= CRM_PRODUCT 产品 ======================= 61 // ======================= CRM_PRODUCT 产品 =======================
62 62
  63 + // TODO @hao：可以把 CRM 产品、和 CRM 产品分类分开哈，量程两个 type；
63 String CRM_PRODUCT_TYPE = "CRM 产品"; 64 String CRM_PRODUCT_TYPE = "CRM 产品";
64 String CRM_PRODUCT_CREATE_SUB_TYPE = "创建产品"; 65 String CRM_PRODUCT_CREATE_SUB_TYPE = "创建产品";
65 String CRM_PRODUCT_CREATE_SUCCESS = "创建了产品【{{#createReqVO.name}}】"; 66 String CRM_PRODUCT_CREATE_SUCCESS = "创建了产品【{{#createReqVO.name}}】";
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductCategoryServiceImpl.java
  View file @772b794
@@ -42,12 +42,14 @@ public class CrmProductCategoryServiceImpl implements CrmProductCategoryService @@ -42,12 +42,14 @@ public class CrmProductCategoryServiceImpl implements CrmProductCategoryService
42 @Override 42 @Override
43 @LogRecord(type = CRM_PRODUCT_CATEGORY_TYPE, subType = CRM_PRODUCT_CATEGORY_CREATE_SUB_TYPE, bizNo = "{{#createReqVO.id}}", 43 @LogRecord(type = CRM_PRODUCT_CATEGORY_TYPE, subType = CRM_PRODUCT_CATEGORY_CREATE_SUB_TYPE, bizNo = "{{#createReqVO.id}}",
44 success = CRM_PRODUCT_CATEGORY_CREATE_SUCCESS) 44 success = CRM_PRODUCT_CATEGORY_CREATE_SUCCESS)
  45 + // TODO @hao：产品分类，应该没数据权限。可以删除下哈；
45 @CrmPermission(bizType = CrmBizTypeEnum.CRM_PRODUCT, bizId = "#createReqVO.id", level = CrmPermissionLevelEnum.WRITE) 46 @CrmPermission(bizType = CrmBizTypeEnum.CRM_PRODUCT, bizId = "#createReqVO.id", level = CrmPermissionLevelEnum.WRITE)
46 public Long createProductCategory(CrmProductCategoryCreateReqVO createReqVO) { 47 public Long createProductCategory(CrmProductCategoryCreateReqVO createReqVO) {
47 // 1.1 校验父分类存在 48 // 1.1 校验父分类存在
48 validateParentProductCategory(createReqVO.getParentId()); 49 validateParentProductCategory(createReqVO.getParentId());
49 // 1.2 分类名称是否存在 50 // 1.2 分类名称是否存在
50 validateProductNameExists(null, createReqVO.getParentId(), createReqVO.getName()); 51 validateProductNameExists(null, createReqVO.getParentId(), createReqVO.getName());
  52 +
51 // 2. 插入分类 53 // 2. 插入分类
52 CrmProductCategoryDO category = BeanUtils.toBean(createReqVO, CrmProductCategoryDO.class); 54 CrmProductCategoryDO category = BeanUtils.toBean(createReqVO, CrmProductCategoryDO.class);
53 productCategoryMapper.insert(category); 55 productCategoryMapper.insert(category);
@@ -65,6 +67,7 @@ public class CrmProductCategoryServiceImpl implements CrmProductCategoryService @@ -65,6 +67,7 @@ public class CrmProductCategoryServiceImpl implements CrmProductCategoryService
65 validateParentProductCategory(updateReqVO.getParentId()); 67 validateParentProductCategory(updateReqVO.getParentId());
66 // 1.3 分类名称是否存在 68 // 1.3 分类名称是否存在
67 validateProductNameExists(updateReqVO.getId(), updateReqVO.getParentId(), updateReqVO.getName()); 69 validateProductNameExists(updateReqVO.getId(), updateReqVO.getParentId(), updateReqVO.getName());
  70 +
68 // 2. 更新分类 71 // 2. 更新分类
69 CrmProductCategoryDO updateObj = BeanUtils.toBean(updateReqVO, CrmProductCategoryDO.class); 72 CrmProductCategoryDO updateObj = BeanUtils.toBean(updateReqVO, CrmProductCategoryDO.class);
70 productCategoryMapper.updateById(updateObj); 73 productCategoryMapper.updateById(updateObj);
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
  View file @772b794
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo; @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.framework.common.validation.InEnum; 4 import cn.iocoder.yudao.framework.common.validation.InEnum;
5 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum; 5 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
  6 +import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
6 import com.fasterxml.jackson.annotation.JsonIgnore; 7 import com.fasterxml.jackson.annotation.JsonIgnore;
7 import io.swagger.v3.oas.annotations.media.Schema; 8 import io.swagger.v3.oas.annotations.media.Schema;
8 import lombok.Data; 9 import lombok.Data;
@@ -50,7 +51,7 @@ public class RewardActivityBaseVO { @@ -50,7 +51,7 @@ public class RewardActivityBaseVO {
50 51
51 @Schema(description = "商品范围", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 52 @Schema(description = "商品范围", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
52 @NotNull(message = "商品范围不能为空") 53 @NotNull(message = "商品范围不能为空")
53 - @InEnum(value = PromotionConditionTypeEnum.class, message = "商品范围必须是 {value}") 54 + @InEnum(value = PromotionProductScopeEnum.class, message = "商品范围必须是 {value}")
54 private Integer productScope; 55 private Integer productScope;
55 56
56 @Schema(description = "商品 SPU 编号的数组", example = "1,2,3") 57 @Schema(description = "商品 SPU 编号的数组", example = "1,2,3")