diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 4f5f6a603..2279265c7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -29,6 +29,7 @@ + INSERT INTO xfsg_line_info diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java index 89642366f..678ac5bcf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java @@ -164,4 +164,6 @@ public class LineInfoDO { */ private Boolean deleted; + private String partnerNum; + } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java index edb4f62a9..ce8e4f09f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java @@ -215,5 +215,8 @@ public class LineInfoVO { @ApiModelProperty("公开拒绝原因") private String rejectPublicReason; + @ApiModelProperty("加盟商编码") + private String partnerNum; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java index 874eb5f36..6591751ef 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java @@ -34,6 +34,8 @@ public class PartnerListVO extends BaseInfoVO{ private Integer wantShopNum; + private String partnerNum; + public PartnerListVO(){} public PartnerListVO(BaseInfoVO baseInfoVO) { 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 dde754240..bff509737 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 @@ -242,6 +242,7 @@ public class LineServiceImpl implements LineService { partnerListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime())); partnerListVO.setLineSourceName(channelMapByIds.get(x.getLineSource())); partnerListVO.setJoinStatus(x.getJoinStatus()); + partnerListVO.setPartnerNum(x.getPartnerNum()); partnerListVO.setInvestmentManagerUserName(userNameMap.get(x.getInvestmentManager())); partnerListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId())); partnerListVO.setDevelopmentManagerUserName(userNameMap.get(x.getDevelopmentManager())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index c6c7d2b2d..c66ae6a9b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -104,8 +104,9 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr roleNames.add("加盟店储备店长"); LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); - String storeId = leaseBaseInfoDO.getStoreId(); - RegionDO regionDO = regionMapper.getRegionByStoreId(storeId); + if (leaseBaseInfoDO==null){ + return null; + } List xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames); List roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList()); List userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds);