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

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

Browse Source
This commit is contained in:
pserimal
2023-06-29 17:03:50 +08:00
parent 8c3989ca90 7a5497a7f2
commit fe9a38272a
14 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java
View File

@@ -39,6 +39,14 @@ public class UserRegionMappingDAO {
return userRegionMappingMapper.deleteUserRegion(regionId, dataSourceEnum.getCode(), excludeUserIds);
}
public Integer deleteUserRegionByUserId(String userId, DataSourceEnum dataSourceEnum, List<String> excludeRegionIds){
if(StringUtils.isBlank(userId) || Objects.isNull(dataSourceEnum)){
return null;
}
return userRegionMappingMapper.deleteUserRegionByExcludeRegionIds(userId, dataSourceEnum.getCode(), excludeRegionIds);
}
public Integer deleteRegionUserByExcludeRegionIds(List<String> excludeRegionIds){
if(CollectionUtils.isEmpty(excludeRegionIds)){
return null;

9
coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java
View File

@@ -34,6 +34,15 @@ public interface UserRegionMappingMapper {
*/
int deleteUserRegion(@Param("regionId") String regionId, @Param("type")Integer type, @Param("excludeUserIds") List<String> excludeUserIds);
/**
* 删除用户不存在的部门
* @param userId
* @param type
* @param excludeRegionIds
* @return
*/
int deleteUserRegionByExcludeRegionIds(@Param("userId") String userId, @Param("type")Integer type, @Param("excludeRegionIds") List<String> excludeRegionIds);
/**
* 删除没有的部门映射关系
* @param excludeRegionIds

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

@@ -387,6 +387,7 @@
hpci.qualify_verify_id as qualifyVerifyId,
hpci.intention_contract_no as intentionContractNo,
hpll.workflow_stage as workflowStage,
hpll.line_status as lineStatus,
hpi.pass_time as passTime,
hpi.pass_reason as passReason,
hpi.recorder as recorderId,

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
View File

@@ -52,8 +52,8 @@
</where>
</select>
<select id="selectByHourDate" resultType="com.cool.store.entity.SyncEcCustomerDO" >
SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile as followmobile FROM hy_partner_user_info a LEFT join hy_partner_line_info b on
a.partner_id=b.partner_id left join enterprise_user c on b.investment_manager=c.user_id
SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile as followmobile ,d.channel_id as channelId FROM hy_partner_user_info a LEFT join hy_partner_line_info b on
a.partner_id=b.partner_id left join enterprise_user c on b.investment_manager=c.user_id LEFT join hy_partner_user_channel d on b.user_channel_id=d.id
WHERE a.create_time BETWEEN #{selectTime} and #{now} or
a.update_time BETWEEN #{selectTime} and #{now} order by a.id Limit #{limit1},#{limit2}
</select>

7
coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml
View File

@@ -111,6 +111,13 @@
</if>
</update>
<update id="deleteUserRegionByExcludeRegionIds">
update user_region_mapping set deleted = 1 where user_id = #{userId} and type = #{type}
<if test="excludeRegionIds != null and excludeRegionIds.size() > 0">
and region_id not in <foreach collection="excludeRegionIds" separator="," open="(" close=")" item="regionId" >#{regionId}</foreach>
</if>
</update>
<update id="deleteRegionUserByExcludeRegionIds">
update user_region_mapping set deleted = 1 where region_id not in <foreach collection="excludeRegionIds" open="(" close=")" separator="," item="regionId">#{regionId}</foreach>
</update>

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

@@ -16,4 +16,6 @@ public class SyncEcCustomerDO {
private String followname;
private String followmobile;
private Integer channelId;
}

5
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java
View File

@@ -25,9 +25,12 @@ public class InterviewVO {
@ApiModelProperty(value = "线索id", required = true)
private Long partnerLineId;
@ApiModelProperty(value = "线索状态")
@ApiModelProperty(value = "流程阶段")
private Long workflowStage;
@ApiModelProperty(value = "线索状态")
private Long lineStatus;
@ApiModelProperty("资质审核流程id")
private String qualifyVerifyId;

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
View File

@@ -167,6 +167,9 @@ public class EcSyncServiceImpl implements EcSyncService {
if (StringUtil.isEmpty(partnerLine.getInvestmentManager())) {
if (StringUtil.isNotEmpty(resultLine.getInvestmentManager())) {
resultLine.setId(partnerLine.getId()).setUpdateTime(new Date());
//沪姨合伙人线索存在黑名单，EC该线索分配跟进人同步到沪姨合伙人但线索状态不变，还存在黑名单中
resultLine.setLineStatus(partnerLine.getLineStatus().intValue()==LineStatusEnum.BLACKLIST.getCode().intValue()
?LineStatusEnum.BLACKLIST.getCode():resultLine.getLineStatus());
hyPartnerLineInfoDAO.updateByPrimaryKeySelective(resultLine);
}
}else {

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

@@ -187,6 +187,7 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
regionPathMap = regionList.stream().collect(Collectors.toMap(k->k.getRegionId(), v->v.getRegionPath()));
userRegionMappingDAO.batchInsertOrUpdateUserRegion(UserRegionMappingDO.convertSyncDO(departmentLists, userDetail.getUserId()));
}
userRegionMappingDAO.deleteUserRegionByUserId(userDetail.getUserId(), DataSourceEnum.SYNC, departmentLists);
String jobTitle = userDetail.getJobTitle();
if(StringUtils.isNotBlank(jobTitle)){
SysRoleDO role = sysRoleDAO.getRoleByName(jobTitle, DataSourceEnum.SYNC);

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -655,9 +655,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
hyPartnerLineInfoDAO.insertSelective(hyPartnerLineInfoDO);
}else {
hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
}
}
return hyPartnerLineInfoDO;
}

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

@@ -109,7 +109,7 @@ public class InterviewWorkFlowService extends WorkFlowBaseService {
}
Integer status = interviewInfo.getStatus();
Date now = new Date();
if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) ||
if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()) ||
(interviewInfo.getRoomStatus()!=null && String.valueOf(RoomStatus.OPEN.getCode()).equals(interviewInfo.getRoomStatus())) ||
(DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0
&& DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) {

2
coolstore-partner-webb/src/main/resources/application-ab.properties
View File

@@ -81,4 +81,4 @@ hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb
hs.sms.templateCode = SMS_461530041
ec.baseUrl=http://58.33.58.162:10019
ec.baseUrl=https://oapi-gateway.shpr.top/basic

2
coolstore-partner-webb/src/main/resources/application-dev.properties
View File

@@ -74,4 +74,4 @@ xxl.job.executor.logretentiondays = 3
xxl.job.accessToken =
ec.baseUrl=http://58.33.58.162:10019
ec.baseUrl=https://oapi-gateway.shpr.top/basic

2
coolstore-partner-webb/src/main/resources/application-local.properties
View File

@@ -83,4 +83,4 @@ xxl.job.executor.logpath = logs/xxl-job/jobhandler
xxl.job.executor.logretentiondays = 30
xxl.job.accessToken =
ec.baseUrl=http://58.33.58.162:10019
ec.baseUrl=http://127.0.0.1:8017