From 5746d9c43530d269aabe8047d7de7be28b7e51b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Thu, 29 Jun 2023 16:22:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=AC=E8=AE=A9=E6=8B=9B=E5=95=86?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 1 + .../main/java/com/cool/store/vo/interview/InterviewVO.java | 5 ++++- .../service/impl/workflow/InterviewWorkFlowService.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 5316b4a10..059f5fb93 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -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, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java index 3ac58a5eb..50e4ec652 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java @@ -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; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java index 6c31f9d9b..1c46a2378 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java @@ -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)) { From 6aa4bbd61d2af511641ee6b0b609487ce17d8e44 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Thu, 29 Jun 2023 16:37:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ec=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerUserInfoMapper.xml | 4 ++-- .../src/main/java/com/cool/store/entity/SyncEcCustomerDO.java | 2 ++ .../java/com/cool/store/service/impl/EcSyncServiceImpl.java | 3 +++ .../src/main/resources/application-ab.properties | 2 +- .../src/main/resources/application-dev.properties | 2 +- .../src/main/resources/application-local.properties | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 5d745947a..4556e00e9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -52,8 +52,8 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java index aeaaaaff5..4dcc9a7fe 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java @@ -16,4 +16,6 @@ public class SyncEcCustomerDO { private String followname; private String followmobile; + + private Integer channelId; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java index a8f1b768f..c70243c05 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java @@ -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 { diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index 7104fe0e5..c55d8d105 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -81,4 +81,4 @@ hs.sms.accessKeySecret = iVOiK74k7C1wVbuUbipgJbfpAh1Zdb hs.sms.templateCode = SMS_461530041 -ec.baseUrl=http://58.33.58.162:10019 \ No newline at end of file +ec.baseUrl=https://oapi-gateway.shpr.top/basic \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 60eb43cbe..8bb7797e4 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -74,4 +74,4 @@ xxl.job.executor.logretentiondays = 3 xxl.job.accessToken = -ec.baseUrl=http://58.33.58.162:10019 \ No newline at end of file +ec.baseUrl=https://oapi-gateway.shpr.top/basic \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 977f9efde..23cb1713f 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -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 \ No newline at end of file +ec.baseUrl=http://127.0.0.1:8017 \ No newline at end of file From f8c499a27910d00b6c0af4c86b48ef4d1983ab34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 29 Jun 2023 17:02:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=AC=E6=B5=B7=E7=BA=BF=E7=B4=A2?= =?UTF-8?q?=E6=89=8D=E4=BF=AE=E6=94=B9=E7=BA=BF=E7=B4=A2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index e4c17326a..1a39d24fb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -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; } From 563321d5b858e60106c93fee8d3693bb891efa7b Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 29 Jun 2023 17:03:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/UserRegionMappingDAO.java | 8 ++++++++ .../com/cool/store/mapper/UserRegionMappingMapper.java | 9 +++++++++ .../main/resources/mapper/UserRegionMappingMapper.xml | 7 +++++++ .../store/service/impl/EnterpriseSyncServiceImpl.java | 1 + 4 files changed, 25 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java index fc8cd9f6f..11fd97982 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java @@ -39,6 +39,14 @@ public class UserRegionMappingDAO { return userRegionMappingMapper.deleteUserRegion(regionId, dataSourceEnum.getCode(), excludeUserIds); } + + public Integer deleteUserRegionByUserId(String userId, DataSourceEnum dataSourceEnum, List excludeRegionIds){ + if(StringUtils.isBlank(userId) || Objects.isNull(dataSourceEnum)){ + return null; + } + return userRegionMappingMapper.deleteUserRegionByExcludeRegionIds(userId, dataSourceEnum.getCode(), excludeRegionIds); + } + public Integer deleteRegionUserByExcludeRegionIds(List excludeRegionIds){ if(CollectionUtils.isEmpty(excludeRegionIds)){ return null; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java index acdcc490b..d12db9cac 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java @@ -34,6 +34,15 @@ public interface UserRegionMappingMapper { */ int deleteUserRegion(@Param("regionId") String regionId, @Param("type")Integer type, @Param("excludeUserIds") List excludeUserIds); + /** + * 删除用户不存在的部门 + * @param userId + * @param type + * @param excludeRegionIds + * @return + */ + int deleteUserRegionByExcludeRegionIds(@Param("userId") String userId, @Param("type")Integer type, @Param("excludeRegionIds") List excludeRegionIds); + /** * 删除没有的部门映射关系 * @param excludeRegionIds diff --git a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml index 73df66fb5..b1b3a0835 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml @@ -111,6 +111,13 @@ + + update user_region_mapping set deleted = 1 where user_id = #{userId} and type = #{type} + + and region_id not in #{regionId} + + + update user_region_mapping set deleted = 1 where region_id not in #{regionId} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java index b90cc309a..a5c7912e8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java @@ -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);