加盟商编码

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

@@ -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

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;
+
 }

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;
+
 
 }

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) {

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

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();
+        if (leaseBaseInfoDO==null){
-        RegionDO regionDO = regionMapper.getRegionByStoreId(storeId);
+            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);