Merge #43 into master from cc_20251208_visit

拜访记录和铺位导出

* cc_20251208_visit: (37 commits squashed)

  - feat:拜访记录

  - fix:拜访详情接口新增字段

  - fix:新增状态转义字段

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix

  - fix:管理员能查看所有加盟商

  - fix:去掉部分字段非空校验

  - fix:空校验

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

  - fix

  - fix:拜访记录失效延时消息

  - fix:拜访记录统计

  - fix:拜访记录统计新增筛选条件

  - fix:字段转义

  - feat:拜访调整

  - feat:拜访调整_过滤我的

  - feat:拜访调整_过滤我的

  - feat:拜访字段调整

  - feat:拜访字段调整

  - Merge branch 'master' into cc_20251208_visit

  - fix:拜访我的加盟商取消管辖权限过滤

  - Merge branch 'master' into cc_20251208_visit

  - fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段

  - fix:新增字段

  - fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

  - fix:过滤未分配招商经理的线索

  - Merge branch 'master' into cc_20251208_visit
    
    # Conflicts:
    #	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

  - Merge branch 'master' into cc_20251208_visit

  - Merge branch 'master' into cc_20251208_visit

  - fix:拜访记录导出

  - fix:拜访记录导出限制

  - fix:拜访记录导出限制

  - fix:铺位导出

  - fix:铺位及拜访记录导出加锁时机修改

  - fix:铺位导出新增字段

  - fix:铺位导出新增字段

  - fix

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/43

coolstore-partner-dao/src/main/java/com/cool/store/dao/PointFinancialDataDAO.java

@@ -1,11 +1,17 @@
 package com.cool.store.dao;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import com.cool.store.entity.PointFinancialDataDO;
 import com.cool.store.mapper.PointFinancialDataMapper;
 import io.lettuce.core.dynamic.annotation.Param;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -44,6 +50,14 @@ public class PointFinancialDataDAO {
         return pointFinancialDataDOMapper.selectByPointId(pointId);
     }
 
-
+    public Map<Long, PointFinancialDataDO> getMapByPointIds(List<Long> pointIds) {
+        if (CollectionUtils.isEmpty(pointIds)) {
+            return Collections.emptyMap();
+        }
+        Example example = new Example(PointFinancialDataDO.class);
+        example.createCriteria().andIn("pointId", pointIds);
+        List<PointFinancialDataDO> list = pointFinancialDataDOMapper.selectByExample(example);
+        return CollStreamUtil.toMap(list, PointFinancialDataDO::getPointId, v -> v);
+    }
 
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/PointInfoDAO.java

@@ -129,6 +129,10 @@ public class PointInfoDAO {
         return pointInfoMapper.getTeamPointPage(eid,request);
     }
 
+    public Long getTeamPointCount(String eid, AllPointPageRequest request) {
+        return pointInfoMapper.getTeamPointCount(eid, request);
+    }
+
     public List<PointMapVO> getAllPointList(String eid, PointMapRequest request) {
         return pointInfoMapper.getAllPointList(eid,request);
     }

coolstore-partner-dao/src/main/java/com/cool/store/dao/visit/VisitRecordDAO.java

@@ -108,6 +108,15 @@ public class VisitRecordDAO {
         return visitRecordMapper.getVisitRecordList(request);
     }
 
+    /**
+     * 拜访记录数量
+     * @param request 拜访记录查询Request
+     * @return 数量
+     */
+    public Long getVisitRecordCount(VisitRecordQueryRequest request) {
+        return visitRecordMapper.getVisitRecordCount(request);
+    }
+
     /**
      * 根据线索id查询已完成拜访数量
      * @param lineId 线索id

coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointInfoMapper.java

@@ -70,6 +70,13 @@ public interface PointInfoMapper extends Mapper<PointInfoDO> {
      */
     Page<PCPointListDTO> getTeamPointPage(@Param("eid")String eid,@Param("request") AllPointPageRequest request);
 
+    /**
+     * 获取团队铺位数量
+     * @param request
+     * @return
+     */
+    Long getTeamPointCount(@Param("eid")String eid, @Param("request") AllPointPageRequest request);
+
     /**
      * 获取所有的铺位 地图
      * @param eid

coolstore-partner-dao/src/main/java/com/cool/store/mapper/visit/VisitRecordMapper.java

@@ -29,6 +29,11 @@ public interface VisitRecordMapper extends Mapper<VisitRecordDO> {
      */
     List<VisitRecordListVO> getVisitRecordList(@Param("request") VisitRecordQueryRequest request);
 
+    /**
+     * 拜访记录数量
+     */
+    Long getVisitRecordCount(@Param("request") VisitRecordQueryRequest request);
+
     /**
      * 查询拜访加盟商线索id
      * @param regionIds 加盟商所属大区id