From 7916851939544edccd13b56e6012dc4028ccb81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 26 Feb 2026 10:30:35 +0000 Subject: [PATCH] Merge #46 into master from cc_20251208_visit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:拜访线索查询逻辑修改 * cc_20251208_visit: (40 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 - fix:我的铺位导出 - Merge branch 'master' into cc_20251208_visit # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java # coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java # coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java # coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java - fix:拜访线索查询逻辑修改 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/46 --- .../src/main/java/com/cool/store/dao/LineInfoDAO.java | 6 +++--- .../java/com/cool/store/mapper/LineInfoMapper.java | 5 ++--- .../src/main/resources/mapper/LineInfoMapper.xml | 5 +++-- .../main/java/com/cool/store/service/LineService.java | 6 ++---- .../com/cool/store/service/impl/LineServiceImpl.java | 11 +++++++---- .../store/controller/webb/LineInfoController.java | 8 ++------ 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index aac6df9d6..60e8ee2a8 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -209,10 +209,10 @@ public class LineInfoDAO { } /** - * 查询已分配招商经理的所有线索 + * 查询所有线索 */ - public List getLinesAssignInvestManager(String keyword) { - return lineInfoMapper.getLinesAssignInvestManager(keyword); + public List getLinesIncludeMobile(String keyword) { + return lineInfoMapper.getLinesIncludeMobile(keyword); } public List getByLineIds(List lineIds){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index 8f991d50d..a97d8398d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -4,7 +4,6 @@ import com.cool.store.dto.InvestmentCountDTO; import com.cool.store.dto.PendingCountDTO; import com.cool.store.dto.openPreparation.PlanLineDTO; import com.cool.store.entity.LineInfoDO; -import com.cool.store.entity.ShopInfoDO; import com.cool.store.request.LineListRequest; import com.cool.store.request.PartnerRequest; import com.cool.store.request.PointLinePageRequest; @@ -136,7 +135,7 @@ public interface LineInfoMapper extends Mapper { List getLinesByKeyword(@Param("keyword") String keyword); /** - * 查询已分配招商经理的所有线索 + * 查询所有线索 */ - List getLinesAssignInvestManager(@Param("keyword") String keyword); + List getLinesIncludeMobile(@Param("keyword") String keyword); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 78ab59475..f047a385e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -650,14 +650,15 @@ order by id desc - select id as lineId, username, mobile from xfsg_line_info - AND (investment_manager IS NOT NULL AND investment_manager != '') + and mobile is not null + and mobile != '' and (mobile like CONCAT('%', #{keyword} ,'%') or username like CONCAT('%', #{keyword} ,'%')) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index e0a355628..22b530d1c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -5,8 +5,6 @@ import com.cool.store.request.*; import com.cool.store.vo.*; import com.github.pagehelper.PageInfo; -import java.util.List; - /** * @Author suzhuhong * @Date 2024/3/25 13:45 @@ -103,9 +101,9 @@ public interface LineService { PageInfo getLines(LinesRequest request); /** - * 查询已分配招商经理的所有线索 + * 查询所有线索 */ - PageInfo getLinesAssignInvestManager(LinesRequest request); + PageInfo getLinesIncludeMobile(LinesRequest request); /** * @Auther: wangshuo diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 13e26b0f0..2af50d69a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -3,7 +3,6 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; -import com.cool.store.constants.RedisConstant; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.dao.visit.VisitRecordDAO; @@ -30,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.MessageFormat; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -648,9 +646,14 @@ public class LineServiceImpl implements LineService { } @Override - public PageInfo getLinesAssignInvestManager(LinesRequest request) { + public PageInfo getLinesIncludeMobile(LinesRequest request) { PageHelper.startPage(request.getPageNum(), request.getPageSize()); - List lines = lineInfoDAO.getLinesAssignInvestManager(request.getKeyword()); + List lines = lineInfoDAO.getLinesIncludeMobile(request.getKeyword()); + lines.forEach(v -> { + if (StringUtils.isBlank(v.getUsername())) { + v.setUsername(""); + } + }); return new PageInfo<>(lines); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index f0631a239..b2c70cee7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -3,7 +3,6 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dto.TransferLogDTO; -import com.cool.store.entity.LineInfoDO; import com.cool.store.enums.point.PayBusinessTypeEnum; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; @@ -20,9 +19,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @Author suzhuhong @@ -180,10 +176,10 @@ public class LineInfoController { return ResponseResult.success(lineService.getLines(request)); } - @ApiOperation("查询已分配招商经理的所有线索") + @ApiOperation("查询所有线索") @PostMapping("/getLinesAssignInvest") public ResponseResult> getLinesAssignInvestManager(@RequestBody LinesRequest request) { - return ResponseResult.success(lineService.getLinesAssignInvestManager(request)); + return ResponseResult.success(lineService.getLinesIncludeMobile(request)); } @ApiOperation("修改所属大区/分公司")