From 3c2f97d2f6ece44e3c89f97413096e0458ca30ec Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 15 May 2025 19:00:55 +0800 Subject: [PATCH] fix --- .../com/cool/store/dao/SignFranchiseDAO.java | 8 ++++++++ .../store/mapper/SignFranchiseMapper.java | 2 ++ .../resources/mapper/SignFranchiseMapper.xml | 8 ++++++++ .../vo/desk/PreparationCommonPendingVO.java | 2 ++ .../store/service/impl/DeskServiceImpl.java | 19 +++++++++++++++++++ 5 files changed, 39 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SignFranchiseDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SignFranchiseDAO.java index 500b16e89..c3ec4e4f9 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SignFranchiseDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SignFranchiseDAO.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -26,4 +27,11 @@ public class SignFranchiseDAO { } return signFranchiseMapper.updateSpecific(list); } + + public List getSignType(List shopIds){ + if (CollectionUtils.isEmpty(shopIds)){ + return new ArrayList<>(); + } + return signFranchiseMapper.getSignType(shopIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SignFranchiseMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SignFranchiseMapper.java index 54bd00639..8ac02937f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SignFranchiseMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SignFranchiseMapper.java @@ -23,4 +23,6 @@ public interface SignFranchiseMapper extends Mapper { * @description:数据处理用修改特定字段 */ Integer updateSpecific(@Param("list") List list); + + List getSignType(@Param("list") List shopIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml index a4297f6c9..5cfb3a0de 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml @@ -75,4 +75,12 @@ #{item} + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java index d0a5b0df2..6f2569622 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java @@ -49,5 +49,7 @@ public class PreparationCommonPendingVO { private Integer joinMode; private Long regionId; private Date updateTime; + @ApiModelProperty("签约类型") + private Integer signType; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 87afc1c9d..6cb7b933d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -52,6 +52,8 @@ import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS; @Service public class DeskServiceImpl implements DeskService { + @Resource + private SignFranchiseDAO signFranchiseDAO; @Resource DecorationMeasureDAO decorationMeasureDAO; @Resource @@ -418,6 +420,8 @@ public class DeskServiceImpl implements DeskService { List lineIds = list.stream().map(PreparationCommonPendingVO::getLineId).collect(Collectors.toList()); List lineInfoDOS = lineInfoDAO.getByLineIds(lineIds); Map lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line)); + List signType = signFranchiseDAO.getSignType(shopIds); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); Set regionIdSet = list.stream().map(PreparationCommonPendingVO::getRegionId).collect(Collectors.toSet()); Map regionNameMap = regionService.getBelongWarRegionNameMap(new ArrayList<>(regionIdSet)); @@ -430,6 +434,8 @@ public class DeskServiceImpl implements DeskService { if (lineInfoDO == null) { continue; } + SignFranchiseDO signFranchiseDO = signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(),new SignFranchiseDO()); + preparationCommonPendingVO.setSignType(signFranchiseDO.getSignType()); preparationCommonPendingVO.setPartnerName(lineInfoDO.getUsername()); preparationCommonPendingVO.setPartnerPhone(lineInfoDO.getMobile()); preparationCommonPendingVO.setRegionNodeName(regionNameMap.getOrDefault(preparationCommonPendingVO.getRegionId(), "")); @@ -603,6 +609,8 @@ public class DeskServiceImpl implements DeskService { List lineIds = list.stream().map(PreparationCommonPendingVO::getLineId).collect(Collectors.toList()); List lineInfoDOS = lineInfoDAO.getByLineIds(lineIds); Map lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line)); + List signType = signFranchiseDAO.getSignType(shopIds); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); Set regionIdSet = list.stream().map(PreparationCommonPendingVO::getRegionId).collect(Collectors.toSet()); Map regionNameMap = regionService.getBelongWarRegionNameMap(new ArrayList<>(regionIdSet)); @@ -615,6 +623,7 @@ public class DeskServiceImpl implements DeskService { if (lineInfoDO == null) { continue; } + preparationCommonPendingVO.setSignType(signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(), new SignFranchiseDO()).getSignType()); preparationCommonPendingVO.setPartnerName(lineInfoDO.getUsername()); preparationCommonPendingVO.setPartnerPhone(lineInfoDO.getMobile()); preparationCommonPendingVO.setRegionNodeName(regionNameMap.getOrDefault(preparationCommonPendingVO.getRegionId(), "")); @@ -653,6 +662,8 @@ public class DeskServiceImpl implements DeskService { List shopInfoList = shopInfoDAO.getShopListByIds(shopIds); List lines = lineInfoDAO.getLines(lineIds); + List signType = signFranchiseDAO.getSignType(shopIds); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); //将shopInfoList 转为map Map shopInfoMap = shopInfoList.stream().collect(Collectors.toMap(ShopInfoDO::getId, shop -> shop)); //将lines 转为map @@ -682,6 +693,10 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); } } + SignFranchiseDO signFranchiseDO = signTypeMap.get(x.getShopId()); + if (signFranchiseDO != null) { + preparationCommonPendingVO.setSignType(signFranchiseDO.getSignType()); + } preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(), new PlanLineDTO()).getInvestmentManagerName()); @@ -742,6 +757,9 @@ public class DeskServiceImpl implements DeskService { //将lines 转为map Map lineMap = lines.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, line -> line)); + List signType = signFranchiseDAO.getSignType(shopIds); + Map signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto)); + List regionIds = shopInfoList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList()); Map userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); @@ -754,6 +772,7 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress()); + preparationCommonPendingVO.setSignType(signTypeMap.getOrDefault(x.getShopId(), new SignFranchiseDO()).getSignType()); preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); preparationCommonPendingVO.setLineId(shopInfoDO.getLineId()); preparationCommonPendingVO.setShopId(x.getShopId());