Merge #40 into master from cc_20251208_visit

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

* cc_20251208_visit: (25 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:新老加盟商判断逻辑修复；统计接口新增筛选条件

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/40

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

@@ -208,6 +208,13 @@ public class LineInfoDAO {
           return lineInfoMapper.getLinesByKeyword(keyword);
     }
 
+    /**
+     * 查询已分配招商经理的所有线索
+     */
+    public List<LineVO> getLinesAssignInvestManager(String keyword) {
+        return lineInfoMapper.getLinesAssignInvestManager(keyword);
+    }
+
     public List<LineInfoDO> getByLineIds(List<Long> lineIds){
         if (CollectionUtils.isEmpty(lineIds)){
             return Lists.newArrayList();

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

@@ -135,4 +135,8 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
 
      List<LineVO> getLinesByKeyword(@Param("keyword") String keyword);
 
+     /**
+      * 查询已分配招商经理的所有线索
+      */
+     List<LineVO> getLinesAssignInvestManager(@Param("keyword") String keyword);
 }

coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

@@ -650,6 +650,21 @@
     order by id desc
   </select>
 
+  <select id="getLinesAssignInvestManager" resultType="com.cool.store.vo.LineVO">
+    select
+        id as lineId,
+        username,
+        mobile
+    from xfsg_line_info
+    <where>
+      <if test="keyword != null and keyword != ''">
+        and (mobile like  CONCAT('%', #{keyword} ,'%')
+        or username like  CONCAT('%', #{keyword} ,'%'))
+      </if>
+    </where>
+    order by id desc
+  </select>
+
 
   <update id="batchUpdateInvestmentManager">
     update xfsg_line_info set line_status = #{status} , investment_manager = #{investmentManager} ,region_id = #{regionId},invest_region_id = #{investRegionId} where id in

coolstore-partner-dao/src/main/resources/mapper/visit/VisitRecordMapper.xml

@@ -62,7 +62,7 @@
   <select id="getVisitRecordList" resultType="com.cool.store.vo.visit.VisitRecordListVO">
     SELECT a.id, a.line_id, a.visit_no, a.visit_date, a.sign_in_address, a.desire, a.desire_city,
            a.desire_district, a.existing_shop_point, a.photos, a.status,
-           b.username name, b.mobile,a.user_id as visitUserId
+           b.username name, b.mobile,a.user_id as visitUserId, b.invest_region_id, b.investment_manager
     FROM zxjp_visit_record a
     INNER JOIN xfsg_line_info b ON a.line_id = b.id AND b.deleted = 0
     <where>
@@ -90,6 +90,12 @@
       <if test="request.userId != null">
         AND a.user_id = #{request.userId}
       </if>
+      <if test="request.desire != null and request.desire != ''">
+        AND a.desire = #{request.desire}
+      </if>
+      <if test="request.investRegionId != null">
+        AND b.invest_region_id = #{request.investRegionId}
+      </if>
     </where>
     ORDER BY a.create_time DESC
   </select>
@@ -165,6 +171,12 @@
       <if test="request.userId != null">
         AND a.user_id = #{request.userId}
       </if>
+      <if test="request.desire != null and request.desire != ''">
+        AND a.desire = #{request.desire}
+      </if>
+      <if test="request.investRegionId != null">
+        AND b.invest_region_id = #{request.investRegionId}
+      </if>
     </where>
   </select>
 </mapper>