📖 CRM：code review 待办事项

YunaiV
1 parent 422b19ca
Showing 4 changed files with 25 additions and 24 deletions
yudao-module-crm/yudao-module-crm-api/src/main/java/cn/iocoder/yudao/module/crm/enums/ErrorCodeConstants.java
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/backlog/vo/CrmTodayCustomerPageReqVO.java
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/customer/CrmCustomerMapper.java
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/message/CrmBacklogServiceImpl.java
@@ -87,6 +87,5 @@ public interface ErrorCodeConstants {
     ErrorCode FOLLOW_UP_RECORD_DELETE_DENIED = new ErrorCode(1_020_013_001, "删除跟进记录失败，原因：没有权限");
     // ========== 待办消息 1_020_014_000 ==========
-    ErrorCode BACKLOG_CONTACT_STATUS_INVALID = new ErrorCode(1_020_014_000, "客户联系状态有误");
 }
@@ -14,11 +14,19 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class CrmTodayCustomerPageReqVO 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 = "1")
     private Integer contactStatus;
 package cn.iocoder.yudao.module.crm.dal.mysql.customer;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -13,15 +14,10 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.lang.Nullable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.Collection;
 import java.util.List;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.BACKLOG_CONTACT_STATUS_INVALID;
-
 /**
  * 客户 Mapper
  *
@@ -85,24 +81,21 @@ public interface CrmCustomerMapper extends BaseMapperX&lt;CrmCustomerDO&gt; {
         CrmQueryWrapperUtils.appendPermissionCondition(query, CrmBizTypeEnum.CRM_CUSTOMER.getType(),
                 CrmCustomerDO::getId, userId, pageReqVO.getSceneType(), null);
-        query.selectAll(CrmCustomerDO.class);
-
         // 拼接自身的查询条件
-        LocalDateTime beginOfToday = LocalDate.now().atTime(LocalTime.MIN);
-        LocalDateTime endOfToday = LocalDate.now().atTime(LocalTime.MAX);
-        if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_TODAY)) {
-            // 今天需联系
-            query.between(CrmCustomerDO::getContactNextTime, beginOfToday, endOfToday);
-        } else if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_EXPIRED)) {
-            // 已逾期
-            query.lt(CrmCustomerDO::getContactNextTime, beginOfToday);
-        } else if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_ALREADY)) {
-            // 已联系
-            query.between(CrmCustomerDO::getContactLastTime, beginOfToday, endOfToday);
-        } else {
-            throw exception(BACKLOG_CONTACT_STATUS_INVALID);
+        query.selectAll(CrmCustomerDO.class);
+        if (pageReqVO.getContactStatus() != null) {
+            LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
+            LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
+            if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_TODAY)) { // 今天需联系
+                query.between(CrmCustomerDO::getContactNextTime, beginOfToday, endOfToday);
+            } else if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_EXPIRED)) { // 已逾期
+                query.lt(CrmCustomerDO::getContactNextTime, beginOfToday);
+            } else if (pageReqVO.getContactStatus().equals(CrmTodayCustomerPageReqVO.CONTACT_ALREADY)) { // 已联系
+                query.between(CrmCustomerDO::getContactLastTime, beginOfToday, endOfToday);
+            } else {
+                throw new IllegalArgumentException("未知联系状态：" + pageReqVO.getContactStatus());
+            }
         }
-
         return selectJoinPage(pageReqVO, CrmCustomerDO.class, query);
     }
@@ -10,8 +10,9 @@ import org.springframework.validation.annotation.Validated;
 /**
  * 待办消息 Service 实现类
+ *
+ * @author dhb52
  */
-
 @Component
 @Validated
 public class CrmBacklogServiceImpl implements CrmBacklogService {