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 b4ff8afa5..9f53e3cb1 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 @@ -97,8 +97,8 @@ public class LineInfoDAO { return lineInfo; } - public List lineList(LineListRequest lineListRequest, String userId, List wantShopAreaIds) { - List lineInfo = lineInfoMapper.lineList(lineListRequest,userId,wantShopAreaIds); + public List lineList(LineListRequest lineListRequest,String wantShopAreaName, String userId, List wantShopAreaIds) { + List lineInfo = lineInfoMapper.lineList(lineListRequest,wantShopAreaName,userId,wantShopAreaIds); return lineInfo; } 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 0dd9d0225..909279423 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 @@ -37,6 +37,7 @@ public interface LineInfoMapper extends Mapper { * @return */ List lineList(@Param("request") LineListRequest lineListRequest, + @Param("wantShopAreaName") String wantShopAreaName, @Param("userId") String userId, @Param("wantShopAreaIds") List wantShopAreaIds); diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index d839f4546..4b246c390 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -326,6 +326,9 @@ and investment_manager = #{userId} + + and b.area_path like concat('%',#{wantShopAreaName},'%') + and username = #{request.userName} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java index 12b7d1771..1d8364a88 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java @@ -27,7 +27,7 @@ public class LineListRequest extends PageBasicInfo { @ApiModelProperty("线索创建时间_结束") private String createTimeEnd; @ApiModelProperty("意向区域ID") - private Integer wantShopAreaId; + private Long wantShopAreaId; @ApiModelProperty("线索来源") private Integer lineSource; @ApiModelProperty("招商经理ID") 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 26f3ff70c..0e98851f0 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 @@ -114,8 +114,13 @@ public class LineServiceImpl implements LineService { userId = loginUserInfo.getUserId(); } } + String areaName = null; + if (lineListRequest.getWantShopAreaId() != null){ + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(lineListRequest.getWantShopAreaId()); + areaName = hyOpenAreaInfoDO.getAreaPath(); + } PageHelper.startPage(lineListRequest.getPageNum(), lineListRequest.getPageSize()); - List lineInfoDOS = lineInfoDAO.lineList(lineListRequest, userId, wantShopAreaIds); + List lineInfoDOS = lineInfoDAO.lineList(lineListRequest,areaName, userId, wantShopAreaIds); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS); List wantShopAreaIdList = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); @@ -191,7 +196,7 @@ public class LineServiceImpl implements LineService { String areaName = null; if (partnerRequest.getWantShopAreaId() != null){ HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(partnerRequest.getWantShopAreaId()); - areaName = hyOpenAreaInfoDO.getAreaName(); + areaName = hyOpenAreaInfoDO.getAreaPath(); } PageHelper.startPage(partnerRequest.getPageNum(), partnerRequest.getPageSize()); List lineInfoDOS = lineInfoDAO.partnerList(partnerRequest,areaName, userId, wantShopAreaIds);