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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-10 10:48:08 +08:00
parent 56244691ad 6207474d4e
commit c20956541f
8 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
View File

@@ -148,7 +148,8 @@ public class CommonConstants {
public static final String FOLLOW_TASK_NOTICE_KEY = "follow_task_notice:{0}:{1}";
public static final Long LONG_ONE = 1L;
// 线索选择的意向区域没有绑定战区，线索分配给【拓展经理胡德龙】
// public static final String DEAULT_INVESTMENT_JOBNUMBER = "17021329";
public static final String DEAULT_INVESTMENT_JOBNUMBER = "020125244825417786";

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/LineAuditInfoDAO.java
View File

@@ -37,4 +37,8 @@ public class LineAuditInfoDAO {
return lineAuditInfoMapper.getLineAuditInfoList(auditIds);
}
public LineAuditInfoDO getAuditInfoByLineId(Long lineId){
return lineAuditInfoMapper.getLineAuditInfo(lineId);
}
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineAuditInfoMapper.java
View File

@@ -16,5 +16,12 @@ public interface LineAuditInfoMapper extends Mapper<LineAuditInfoDO> {
*/
List<LineAuditInfoDO> getLineAuditInfoList(@Param("ids") List<Long> ids);
/**
* 结束跟进记录
* @param lineId
* @return
*/
LineAuditInfoDO getLineAuditInfo(@Param("lineId") Long lineId);
}

6
coolstore-partner-dao/src/main/resources/mapper/LineAuditInfoMapper.xml
View File

@@ -28,4 +28,10 @@
</if>
</where>
</select>
<select id="getLineAuditInfo" resultMap="BaseResultMap">
select * from
xfsg_line_audit_info
where line_id = #{lineId} and result_type = 2 order by id desc limit 1
</select>
</mapper>

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

@@ -403,6 +403,9 @@
<if test="userId != null and userId != ''">
and a.investment_manager = #{userId}
</if>
<if test="request.joinStatus != null">
and a.join_status = #{request.joinStatus}
</if>
<if test="request.keyword != null and request.keyword!=''">
and (a.username like #{request.keyword} or a.mobile like #{request.keyword})
</if>

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -189,6 +189,8 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
initiatingDO.setKdzBusinessId(lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus());
InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class);
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
return initiatingResponse;
}

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

@@ -99,6 +99,10 @@ public class LineServiceImpl implements LineService {
result.setLargeRegionId(bigRegionIdByAreaId);
result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
}
LineAuditInfoDO lineAuditInfoDO = lineAuditInfoDAO.getAuditInfoByLineId(lineInfo.getId());
if (lineAuditInfoDO!=null){
result.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason());
}
MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfo.getId());
Map<Long, HyPartnerLabelDO> userPortraitMap = deskService.getUserPortraitMap(Arrays.asList(lineInfo));

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

@@ -106,6 +106,9 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
}
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){
// 按工号排序后放入redis
authWarRegionUserIdList = authWarRegionUserIdList.stream()
.sorted((a, b) -> a.compareTo(b))
.collect(Collectors.toList());
redisUtilPool.listPushTail(investmentManagerKey, authWarRegionUserIdList.toArray(new String[authWarRegionUserIdList.size()]));
suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
}else {
@@ -139,7 +142,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
}
List<Long> roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList());
List<EnterpriseUserRole> enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList);
enterpriseUserRoleList = enterpriseUserRoleList.stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList());
enterpriseUserRoleList = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList());
Map<String, List<String>> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k->k.getUserId(), Collectors.toList())));
return enterpriseUserRoleMap;
}