suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加盟商编码

Browse Source
This commit is contained in:
苏竹红
2024-04-08 11:45:39 +08:00
parent a675c750ac
commit 2200eccf26
6 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -29,6 +29,7 @@
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="partner_num" jdbcType="VARCHAR" property="partnerNum" />
</resultMap>
<insert id="insertOrUpdate" parameterType="com.cool.store.entity.LineInfoDO" useGeneratedKeys="true" keyProperty="id">
INSERT INTO xfsg_line_info

2
coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
View File

@@ -164,4 +164,6 @@ public class LineInfoDO {
*/
private Boolean deleted;
private String partnerNum;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
View File

@@ -215,5 +215,8 @@ public class LineInfoVO {
@ApiModelProperty("公开拒绝原因")
private String rejectPublicReason;
@ApiModelProperty("加盟商编码")
private String partnerNum;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java
View File

@@ -34,6 +34,8 @@ public class PartnerListVO extends BaseInfoVO{
private Integer wantShopNum;
private String partnerNum;
public PartnerListVO(){}
public PartnerListVO(BaseInfoVO baseInfoVO) {

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -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()));

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
View File

@@ -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<SysRoleDO> xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames);
List<Long> roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList());
List<String> userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds);