From ef12033705bf0b01a8302d028a2ea11d64a4f151 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 1 Mar 2025 17:16:53 +0800 Subject: [PATCH 01/13] fix --- .../java/com/cool/store/dao/LineInfoDAO.java | 3 --- .../java/com/cool/store/dao/ShopInfoDAO.java | 4 +-- .../com/cool/store/mapper/ShopInfoMapper.java | 2 +- .../main/resources/mapper/LineInfoMapper.xml | 25 ++++++++++++++----- .../main/resources/mapper/ShopInfoMapper.xml | 17 ++++++------- .../com/cool/store/service/LineService.java | 2 +- .../store/service/impl/LineServiceImpl.java | 20 +++++++++------ .../controller/webb/LineInfoController.java | 2 +- .../store/controller/webc/LineController.java | 2 +- 9 files changed, 44 insertions(+), 33 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 2ab9200dc..caeeb0799 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 @@ -23,12 +23,10 @@ import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -221,5 +219,4 @@ public class LineInfoDAO { List lineMobile = lineInfoMapper.getByLineIds(lineIds); return lineMobile.stream().filter(o->StringUtils.isNotBlank(o.getMobile())).collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getUsername, (k1, k2)-> k1)); } - } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 24df8635b..2739d7c19 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -213,10 +213,10 @@ public class ShopInfoDAO { return shopInfoMapper.batchUpdate(list); } - public List selectInvestmentByLines(List lineIds) { + public List selectByLines(List lineIds,List regionIds) { if (CollectionUtils.isEmpty(lineIds)) { return new ArrayList<>(); } - return shopInfoMapper.selectInvestmentByList(lineIds); + return shopInfoMapper.selectByLines(lineIds,regionIds); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index c56f33362..540904d76 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -118,5 +118,5 @@ public interface ShopInfoMapper extends Mapper { Boolean batchUpdate(List list); - List selectInvestmentByList (@Param("list") List list); + List selectByLines (@Param("list") List list,@Param("regionIds") List regionIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index eae948347..4d0b5a6b3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -462,13 +462,14 @@ diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 8289cccc7..6bb54f21e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -346,17 +346,13 @@ select from xfsg_shop_info where line_id = #{lineId} and deleted= '0' - and ( 1=1 - - or investment_manager = #{userId} - - or region_id in + and region_id in #{item} - ) + @@ -389,15 +385,16 @@ - + select * from xfsg_shop_info where line_id in #{item} + + #{item} + 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 b4a671f1a..8c38d01b2 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 @@ -20,7 +20,7 @@ public interface LineService { * @param lineId * @return */ - LineInfoVO getLineInfo(Long lineId); + LineInfoVO getLineInfo(Long lineId,String userId); /** 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 6b00ec247..8b5f013d9 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 @@ -1,7 +1,6 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; @@ -12,10 +11,8 @@ import com.cool.store.enums.point.PayBusinessTypeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.IntentAgreementMapper; import com.cool.store.mapper.JoinIntentionMapper; -import com.cool.store.mapper.RegionMapper; import com.cool.store.request.*; import com.cool.store.service.*; -import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.StringUtil; import com.cool.store.utils.UUIDUtils; import com.cool.store.utils.poi.DateUtils; @@ -30,7 +27,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author suzhuhong @@ -86,7 +82,7 @@ public class LineServiceImpl implements LineService { @Override - public LineInfoVO getLineInfo(Long lineId) { + public LineInfoVO getLineInfo(Long lineId,String currentUserId) { LineInfoVO result = new LineInfoVO(); // 查询线索信息 LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); @@ -100,8 +96,16 @@ public class LineServiceImpl implements LineService { Map channelMapByIds = hyPartnerUserChannelDAO.getChannelMapByIds(Arrays.asList(lineInfo.getLineSource())); result.setLineSourceName(channelMapByIds.get(lineInfo.getLineSource())); } - - List shopInfoDOS = shopInfoDAO.selectInvestmentByLines(Collections.singletonList(lineInfo.getId())); + List regionId = new ArrayList<>(); + if (StringUtils.isNotBlank(currentUserId) && !sysRoleService.checkIsAdmin(currentUserId)) { + List list = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(currentUserId); + if (CollectionUtils.isNotEmpty(list)) { + for (String s : list) { + regionId.add(Long.valueOf(s)); + } + } + } + List shopInfoDOS = shopInfoDAO.selectByLines(Collections.singletonList(lineInfo.getId()),regionId); Set userIds = new HashSet<>(); //门店的招生和选址人远 Set shopInvestmentMserIds = shopInfoDOS.stream().map(ShopInfoDO::getInvestmentManager).filter(StringUtils::isNotBlank).collect(Collectors.toSet()); @@ -287,7 +291,7 @@ public class LineServiceImpl implements LineService { List lineInfoDOS = lineInfoDAO.partnerList(partnerRequest, areaName, userId, regionId); PageInfo page = new PageInfo(lineInfoDOS); List lineIds = lineInfoDOS.stream().map(LineInfoDO::getId).collect(Collectors.toList()); - List shopInfoDOS = shopInfoDAO.selectInvestmentByLines(lineIds); + List shopInfoDOS = shopInfoDAO.selectByLines(lineIds,regionId); Map> investmentManagerIdMapByLineId = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getInvestmentManager, Collectors.toSet()))); Map> developmentManagerMap = shopInfoDOS.stream().collect(Collectors.groupingBy(ShopInfoDO::getLineId, Collectors.mapping(ShopInfoDO::getDevelopmentManager, Collectors.toSet()))); 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 f1eb342d8..bec65dea7 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 @@ -48,7 +48,7 @@ public class LineInfoController { @ApiImplicitParam(name = "lineId", value = "线索id", required = true) }) public ResponseResult getLineInfo(@RequestParam("lineId")Long lineId) { - return ResponseResult.success(lineService.getLineInfo(lineId)); + return ResponseResult.success(lineService.getLineInfo(lineId,CurrentUserHolder.getUserId())); } @ApiOperation("我的线索") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java index c663c6d0e..bbaaf3405 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java @@ -46,7 +46,7 @@ public class LineController { @ApiImplicitParam(name = "lineId", value = "线索id", required = true) }) public ResponseResult getLineInfo(@RequestParam("lineId")Long lineId) { - return ResponseResult.success(lineService.getLineInfo(lineId)); + return ResponseResult.success(lineService.getLineInfo(lineId, null)); } @ApiOperation("根据线索id查询大区的支付二维码图片") From f793b09c89c926c381df8814d3ebad7b80be597e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 1 Mar 2025 17:34:16 +0800 Subject: [PATCH 02/13] fix --- .../src/main/resources/mapper/LineInfoMapper.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 4d0b5a6b3..236af42aa 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -462,7 +462,17 @@