refactor(service): 清理和优化多个服务类中的冗余代码

- 移除DictAreaRegionService中未使用的Mapper字段和导入
- 删除SysCustomerDataFollowOrderService中多余的用户权限判断代码
- 优化日期处理逻辑，新增当天开始结束时间变量，调整查询时间范围
- 更新SysCustomerDataFollowService中queryCustomerOrderSelectData方法参数，移除userId相关逻辑
- 删除注释掉的无用代码，简化条件查询
- 清理SysCustomerFollowService中的未使用依赖注入字段和导入

src/main/java/com/jtzx/crm/module/sys/service/DictAreaRegionService.java

@@ -5,7 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jtzx.crm.module.sys.entity.DictAreaRegionEntity;
-import com.jtzx.crm.module.sys.mapper.DictAreaRegionMapper;
 import com.jtzx.crm.module.sys.model.response.DictAreaRegionBO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +23,6 @@ import java.util.List;
 @Slf4j
 public class DictAreaRegionService {
 
-    private final DictAreaRegionMapper dictAreaRegionMapper;
 
 
 

src/main/java/com/jtzx/crm/module/sys/service/SysCustomerDataFollowOrderService.java

@@ -1,7 +1,6 @@
 package com.jtzx.crm.module.sys.service;
 
 
-import cc.uncarbon.framework.core.context.UserContextHolder;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
@@ -44,11 +43,6 @@ public class SysCustomerDataFollowOrderService {
         resultData.setStatus2Count(0);
         resultData.setTotalCount(0);
         resultData.setDateList(Lists.newArrayList());
-        if (dto.getUserId() == null) {
-            if(!UserContextHolder.getUserContext().getRoles().contains("Admin")){
-                dto.setUserId(UserContextHolder.getUserId());
-            }
-        }
 
         String dateStr = DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd");
         if (StrUtil.isNotEmpty(dto.getDatetime())) {
@@ -56,12 +50,14 @@ public class SysCustomerDataFollowOrderService {
         }
         //当月开始时间
         DateTime startMonthDay = DateUtil.beginOfMonth(DateUtil.parse(dateStr));
-//        //当月结束时间
+        //当天开始时间
+        DateTime startDay = DateUtil.beginOfDay(DateUtil.parse(dateStr));
+        //当月结束时间
         DateTime endMonthDay = DateUtil.endOfMonth(DateUtil.parse(dateStr));
+        //当天结束时间
+        DateTime endDay = DateUtil.endOfDay(DateUtil.parse(dateStr));
         // 筛选条件数据
-        resultData.setSelectData(sysCustomerDataFollowService.queryCustomerOrderSelectData(dto.getUserId(),0, true,startMonthDay,endMonthDay));
-
-
+        resultData.setSelectData(sysCustomerDataFollowService.queryCustomerOrderSelectData(0, true, startDay, endDay));
 
         //如果是 yyyy-MM 格式，则需要重新设置为当月开始时间和结束时间
         DateTime startDateTime = DateUtil.beginOfDay(DateUtil.parseDate(dateStr));
@@ -86,7 +82,7 @@ public class SysCustomerDataFollowOrderService {
                                 )
                                 .ge(SysCustomerFollowEntity::getOrderDatetime, startMonthDay)
                                 .le(SysCustomerFollowEntity::getOrderDatetime, endMonthDay)
-                                .eq(SysCustomerFollowEntity::getFollowId,33) //只查询方案演示
+                                .eq(SysCustomerFollowEntity::getFollowId, 33) //只查询方案演示
                                 .eq(SysCustomerFollowEntity::getOrderType, 0)
                 );
         if (CollUtil.isNotEmpty(listData)) {

src/main/java/com/jtzx/crm/module/sys/service/SysCustomerDataFollowService.java

@@ -46,8 +46,6 @@ public class SysCustomerDataFollowService {
 
     private final SysCustomerDataMapper sysCustomerDataMapper;
 
-    private final SysUserMapper sysUserMapper;
-
     private final SysCustomerUserCommonService sysCustomerUserCommonService;
 
     private final SysCustomerOperLogService sysCustomerOperLogService;
@@ -179,7 +177,7 @@ public class SysCustomerDataFollowService {
      *
      * @return
      */
-    public SysCustomerFollowHistorySelectBO queryCustomerOrderSelectData(Long userId, Integer orderType, Boolean orderStatus,
+    public SysCustomerFollowHistorySelectBO queryCustomerOrderSelectData(Integer orderType, Boolean orderStatus,
                                                                          DateTime startDateTime, DateTime endDateTime) {
         SysCustomerFollowHistorySelectBO resultData = SysCustomerFollowHistorySelectBO.builder().build();
         List<BindUserBO> memberData = Lists.newArrayList();
@@ -193,7 +191,6 @@ public class SysCustomerDataFollowService {
                                         SysCustomerFollowEntity::getClaimUserName,
                                         SysCustomerFollowEntity::getOrderStatus
                                 )
-                                .eq(SysCustomerFollowEntity::getClaimUserId, userId)
                                 .eq(SysCustomerFollowEntity::getOrderType, orderType)
                                 .eq(SysCustomerFollowEntity::getFollowId, 33) //只查询方案演示
                                 .ge(startDateTime != null, SysCustomerFollowEntity::getOrderDatetime, DateUtil.toLocalDateTime(startDateTime))
@@ -231,17 +228,9 @@ public class SysCustomerDataFollowService {
                         }
                     }
             );
-//            BindUserBO memberBO = BindUserBO.builder()
-//                    .username("全部")
-//                    .build();
-//            memberData.addFirst(memberBO);
         }
         resultData.setMemberData(memberData);
         if (orderStatus) {
-//            OrderBO orderStatusBO = OrderBO.builder()
-//                    .name("全部")
-//                    .build();
-//            orderStatusData.addFirst(orderStatusBO);
             resultData.setOrderStatusData(orderStatusData);
         }
 
@@ -450,8 +439,6 @@ public class SysCustomerDataFollowService {
                                 .and(StrUtil.isNotEmpty(queryStr), z ->
                                                 z.like(SysCustomerFollowEntity::getCustomerName, queryStr)
                                                         .or().like(SysCustomerFollowEntity::getClaimUserName, queryStr)
-//                                        .or().like(SysCustomerFollowEntity::getCustomerPersonName, queryStr)
-//                                        .or().like(SysCustomerFollowEntity::getPositionName, queryStr)
                                 )
                                 .orderByDesc(orderType == 0, SysCustomerFollowEntity::getOrderDatetime, SysCustomerFollowEntity::getCreatedAt)
                                 .orderByDesc(orderType == 1, SysCustomerFollowEntity::getCreatedAt)

src/main/java/com/jtzx/crm/module/sys/service/SysCustomerFollowService.java

@@ -51,7 +51,6 @@ public class SysCustomerFollowService {
 
     private final SysUserMapper sysUserMapper;
 
-    private final SysCustomerDataPermissionService permissionService;
 
     private final RedisMQTemplate redisMQTemplate;